Mercurial > mplayer.hg
annotate mplayer.c @ 23712:2779d6600071
synced with r23731
author | Gabrov |
---|---|
date | Sat, 07 Jul 2007 10:05:05 +0000 |
parents | 21c28c2645fe |
children | 11abe5f3dcaa |
rev | line source |
---|---|
18261 | 1 |
2 /// \file | |
3 /// \ingroup Properties Command2Property OSDMsgStack | |
4 | |
1430 | 5 #include <stdio.h> |
6 #include <stdlib.h> | |
12360 | 7 #include "config.h" |
8 | |
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
|
9 #ifdef WIN32 |
133e0ebde74d
Make it compile on mingw again. Now it is finally possible to include windows.h in mplayer.c
faust3
parents:
12332
diff
changeset
|
10 #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
|
11 #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
|
12 #endif |
1430 | 13 #include <string.h> |
14 #include <unistd.h> | |
1428
a90d889eb649
largefile patch by Stephen Davies <steve@daviesfam.org>
arpi
parents:
1422
diff
changeset
|
15 |
5288
370d13663229
we don't use mmap() in mplayer.c, so why should we include mman.h...
arpi
parents:
5221
diff
changeset
|
16 // #include <sys/mman.h> |
1428
a90d889eb649
largefile patch by Stephen Davies <steve@daviesfam.org>
arpi
parents:
1422
diff
changeset
|
17 #include <sys/types.h> |
9831 | 18 #ifndef __MINGW32__ |
19 #include <sys/ioctl.h> | |
1428
a90d889eb649
largefile patch by Stephen Davies <steve@daviesfam.org>
arpi
parents:
1422
diff
changeset
|
20 #include <sys/wait.h> |
9831 | 21 #else |
22 #define SIGHUP 1 /* hangup */ | |
23 #define SIGQUIT 3 /* quit */ | |
24 #define SIGKILL 9 /* kill (cannot be caught or ignored) */ | |
25 #define SIGBUS 10 /* bus error */ | |
16049
0ccf19820216
define SIGHUP and SIGPIPE for MinGW and catch SIGPIPE also in mplayer
reimar
parents:
16036
diff
changeset
|
26 #define SIGPIPE 13 /* broken pipe */ |
10928 | 27 extern int mp_input_win32_slave_cmd_func(int fd,char* dest,int size); |
9831 | 28 #endif |
29 | |
1428
a90d889eb649
largefile patch by Stephen Davies <steve@daviesfam.org>
arpi
parents:
1422
diff
changeset
|
30 #include <sys/time.h> |
a90d889eb649
largefile patch by Stephen Davies <steve@daviesfam.org>
arpi
parents:
1422
diff
changeset
|
31 #include <sys/stat.h> |
a90d889eb649
largefile patch by Stephen Davies <steve@daviesfam.org>
arpi
parents:
1422
diff
changeset
|
32 |
a90d889eb649
largefile patch by Stephen Davies <steve@daviesfam.org>
arpi
parents:
1422
diff
changeset
|
33 #include <signal.h> |
a90d889eb649
largefile patch by Stephen Davies <steve@daviesfam.org>
arpi
parents:
1422
diff
changeset
|
34 #include <time.h> |
a90d889eb649
largefile patch by Stephen Davies <steve@daviesfam.org>
arpi
parents:
1422
diff
changeset
|
35 #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
|
36 #include <limits.h> |
1428
a90d889eb649
largefile patch by Stephen Davies <steve@daviesfam.org>
arpi
parents:
1422
diff
changeset
|
37 |
5112 | 38 #include <errno.h> |
39 | |
1430 | 40 #include "version.h" |
1584 | 41 |
1564 | 42 #include "mp_msg.h" |
1 | 43 |
1584 | 44 #define HELP_MP_DEFINE_STATIC |
45 #include "help_mp.h" | |
46 | |
8164
487cfc28525d
New config system + cleanup of header inter dependency
albeu
parents:
8123
diff
changeset
|
47 #include "m_option.h" |
487cfc28525d
New config system + cleanup of header inter dependency
albeu
parents:
8123
diff
changeset
|
48 #include "m_config.h" |
17911
52f95509cd05
Add the new property API and implement a couple properties.
albeu
parents:
17910
diff
changeset
|
49 #include "m_property.h" |
9752 | 50 |
151 | 51 #include "cfg-mplayer-def.h" |
147 | 52 |
258 | 53 #include "subreader.h" |
54 | |
36 | 55 #include "libvo/video_out.h" |
1422 | 56 |
5293
fd992ece4367
include font_load.h directly, instead of via video_out.h
arpi
parents:
5288
diff
changeset
|
57 #include "libvo/font_load.h" |
220 | 58 #include "libvo/sub.h" |
36 | 59 |
10211
4bc481804519
warning fixes by Dominik Mierzejewski <dominik@rangers.eu.org>
alex
parents:
10167
diff
changeset
|
60 #ifdef HAVE_X11 |
4bc481804519
warning fixes by Dominik Mierzejewski <dominik@rangers.eu.org>
alex
parents:
10167
diff
changeset
|
61 #include "libvo/x11_common.h" |
4bc481804519
warning fixes by Dominik Mierzejewski <dominik@rangers.eu.org>
alex
parents:
10167
diff
changeset
|
62 #endif |
4bc481804519
warning fixes by Dominik Mierzejewski <dominik@rangers.eu.org>
alex
parents:
10167
diff
changeset
|
63 |
955 | 64 #include "libao2/audio_out.h" |
65 | |
303 | 66 #include "codec-cfg.h" |
175 | 67 |
8531
1aa2c9b460af
Merged EDL 0.5 patch - it's something like Quicktime's edit lists.
arpi
parents:
8494
diff
changeset
|
68 #include "edl.h" |
1aa2c9b460af
Merged EDL 0.5 patch - it's something like Quicktime's edit lists.
arpi
parents:
8494
diff
changeset
|
69 |
560
28ae99036574
Separated dvdsub code to be able to work with it easier
lgb
parents:
557
diff
changeset
|
70 #include "spudec.h" |
4079 | 71 #include "vobsub.h" |
492 | 72 |
9380 | 73 #include "osdep/getch2.h" |
74 #include "osdep/timer.h" | |
1 | 75 |
2272 | 76 #include "cpudetect.h" |
77 | |
2036 | 78 #ifdef HAVE_NEW_GUI |
23077 | 79 #include "gui/interface.h" |
2036 | 80 #endif |
81 | |
4418
8141d2c399e4
A new configurable input system and joystick support for this system
albeu
parents:
4395
diff
changeset
|
82 #include "input/input.h" |
8141d2c399e4
A new configurable input system and joystick support for this system
albeu
parents:
4395
diff
changeset
|
83 |
3322
cdd3f5ac06b2
-slave patch by Kilian A. Foth <foth@informatik.uni-hamburg.de>
arpi
parents:
3302
diff
changeset
|
84 int slave_mode=0; |
16347
da2926d990ce
Adds -idle, an option to make MPlayer wait for input ('loadfile' or
ods15
parents:
16346
diff
changeset
|
85 int player_idle_mode=0; |
11875
6b28eb95c08b
* changes mencoder's exit code on explicit kill to 2
attila
parents:
11778
diff
changeset
|
86 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
|
87 int enable_mouse_movements=0; |
1 | 88 |
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
|
89 #ifdef WIN32 |
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
|
90 char * proc_priority=NULL; |
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
|
91 #endif |
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
|
92 |
8606
d80edba39db9
This patch makes subtitle and A-V delays display correctly rounded
arpi
parents:
8593
diff
changeset
|
93 #define ROUND(x) ((int)((x)<0 ? (x)-0.5 : (x)+0.5)) |
398 | 94 |
3015 | 95 #ifdef HAVE_RTC |
14381
dc7b86065e3c
RTC support on FreeBSD, inspired by a patch from Michael Johnson
diego
parents:
14296
diff
changeset
|
96 #ifdef __linux__ |
2889
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
97 #include <linux/rtc.h> |
14381
dc7b86065e3c
RTC support on FreeBSD, inspired by a patch from Michael Johnson
diego
parents:
14296
diff
changeset
|
98 #else |
dc7b86065e3c
RTC support on FreeBSD, inspired by a patch from Michael Johnson
diego
parents:
14296
diff
changeset
|
99 #include <rtc.h> |
dc7b86065e3c
RTC support on FreeBSD, inspired by a patch from Michael Johnson
diego
parents:
14296
diff
changeset
|
100 #define RTC_IRQP_SET RTCIO_IRQP_SET |
dc7b86065e3c
RTC support on FreeBSD, inspired by a patch from Michael Johnson
diego
parents:
14296
diff
changeset
|
101 #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
|
102 #endif /* __linux__ */ |
f17b3c152fd6
Add comments to a few #endif statements in order to make clear which
diego
parents:
16489
diff
changeset
|
103 #endif /* HAVE_RTC */ |
2889
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
104 |
2941
60c1b7c0ea21
added support for norm=,chanlist=,channel= and also on-the-fly channel chaning with keys
alex
parents:
2897
diff
changeset
|
105 #ifdef USE_TV |
19271
64d82a45a05d
introduce new 'stream' directory for all stream layer related components and split them from libmpdemux
ben
parents:
19227
diff
changeset
|
106 #include "stream/tv.h" |
2941
60c1b7c0ea21
added support for norm=,chanlist=,channel= and also on-the-fly channel chaning with keys
alex
parents:
2897
diff
changeset
|
107 #endif |
19568
bd821fd3e244
Radio support, patch by Vladimir Voroshilov (voroshil gmail com)
reimar
parents:
19533
diff
changeset
|
108 #ifdef USE_RADIO |
bd821fd3e244
Radio support, patch by Vladimir Voroshilov (voroshil gmail com)
reimar
parents:
19533
diff
changeset
|
109 #include "stream/stream_radio.h" |
bd821fd3e244
Radio support, patch by Vladimir Voroshilov (voroshil gmail com)
reimar
parents:
19533
diff
changeset
|
110 #endif |
2941
60c1b7c0ea21
added support for norm=,chanlist=,channel= and also on-the-fly channel chaning with keys
alex
parents:
2897
diff
changeset
|
111 |
9610 | 112 #ifdef HAS_DVBIN_SUPPORT |
19271
64d82a45a05d
introduce new 'stream' directory for all stream layer related components and split them from libmpdemux
ben
parents:
19227
diff
changeset
|
113 #include "stream/dvbin.h" |
19808
5385740067a1
* remove extern definitions of functions in .c files
attila
parents:
19774
diff
changeset
|
114 #include "stream/cache2.h" |
9610 | 115 #endif |
116 | |
258 | 117 //**************************************************************************// |
4045
898caa690c0b
playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents:
3934
diff
changeset
|
118 // Playtree |
898caa690c0b
playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents:
3934
diff
changeset
|
119 //**************************************************************************// |
898caa690c0b
playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents:
3934
diff
changeset
|
120 #include "playtree.h" |
10211
4bc481804519
warning fixes by Dominik Mierzejewski <dominik@rangers.eu.org>
alex
parents:
10167
diff
changeset
|
121 #include "playtreeparser.h" |
4bc481804519
warning fixes by Dominik Mierzejewski <dominik@rangers.eu.org>
alex
parents:
10167
diff
changeset
|
122 |
4bc481804519
warning fixes by Dominik Mierzejewski <dominik@rangers.eu.org>
alex
parents:
10167
diff
changeset
|
123 #ifdef HAVE_NEW_GUI |
4bc481804519
warning fixes by Dominik Mierzejewski <dominik@rangers.eu.org>
alex
parents:
10167
diff
changeset
|
124 extern int import_playtree_playlist_into_gui(play_tree_t* my_playtree, m_config_t* config); |
4bc481804519
warning fixes by Dominik Mierzejewski <dominik@rangers.eu.org>
alex
parents:
10167
diff
changeset
|
125 extern int import_initial_playtree_into_gui(play_tree_t* my_playtree, m_config_t* config, int enqueue); |
4bc481804519
warning fixes by Dominik Mierzejewski <dominik@rangers.eu.org>
alex
parents:
10167
diff
changeset
|
126 #endif |
4045
898caa690c0b
playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents:
3934
diff
changeset
|
127 |
4156
22fadd4022b5
playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents:
4152
diff
changeset
|
128 //**************************************************************************// |
22fadd4022b5
playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents:
4152
diff
changeset
|
129 // Config |
22fadd4022b5
playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents:
4152
diff
changeset
|
130 //**************************************************************************// |
19808
5385740067a1
* remove extern definitions of functions in .c files
attila
parents:
19774
diff
changeset
|
131 #include "parser-cfg.h" |
5385740067a1
* remove extern definitions of functions in .c files
attila
parents:
19774
diff
changeset
|
132 #include "parser-mpcmd.h" |
5385740067a1
* remove extern definitions of functions in .c files
attila
parents:
19774
diff
changeset
|
133 |
4156
22fadd4022b5
playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents:
4152
diff
changeset
|
134 m_config_t* mconfig; |
22fadd4022b5
playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents:
4152
diff
changeset
|
135 |
4045
898caa690c0b
playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents:
3934
diff
changeset
|
136 //**************************************************************************// |
258 | 137 // Config file |
138 //**************************************************************************// | |
139 | |
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
|
140 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
|
141 |
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
|
142 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
|
143 return m_config_parse_config_file(mconfig, filename); |
162 | 144 } |
145 | |
2557 | 146 #include "get_path.c" |
178 | 147 |
1 | 148 //**************************************************************************// |
9695 | 149 // XScreensaver |
150 //**************************************************************************// | |
151 | |
10661
49d7d02f4485
X11_FULLSCREEN vs HAVE_X11 definitions and some warning fixes
alex
parents:
10646
diff
changeset
|
152 #ifdef HAVE_X11 |
11999 | 153 void xscreensaver_heartbeat(void); |
10661
49d7d02f4485
X11_FULLSCREEN vs HAVE_X11 definitions and some warning fixes
alex
parents:
10646
diff
changeset
|
154 #endif |
9695 | 155 |
156 //**************************************************************************// | |
442 | 157 //**************************************************************************// |
158 // Input media streaming & demultiplexer: | |
159 //**************************************************************************// | |
160 | |
1289 | 161 static int max_framesize=0; |
162 | |
19271
64d82a45a05d
introduce new 'stream' directory for all stream layer related components and split them from libmpdemux
ben
parents:
19227
diff
changeset
|
163 #include "stream/stream.h" |
7559
b645204ea527
some cleanup - made private vars/funcs static, removed obsolete externs
arpi
parents:
7529
diff
changeset
|
164 #include "libmpdemux/demuxer.h" |
b645204ea527
some cleanup - made private vars/funcs static, removed obsolete externs
arpi
parents:
7529
diff
changeset
|
165 #include "libmpdemux/stheader.h" |
b645204ea527
some cleanup - made private vars/funcs static, removed obsolete externs
arpi
parents:
7529
diff
changeset
|
166 //#include "parse_es.h" |
13132 | 167 #include "libmpdemux/matroska.h" |
1 | 168 |
18682
bee3186a06f7
include stream_dvd's interface from libmpdemux/stream_dvd.h
nicodvb
parents:
18679
diff
changeset
|
169 #ifdef USE_DVDREAD |
19271
64d82a45a05d
introduce new 'stream' directory for all stream layer related components and split them from libmpdemux
ben
parents:
19227
diff
changeset
|
170 #include "stream/stream_dvd.h" |
18682
bee3186a06f7
include stream_dvd's interface from libmpdemux/stream_dvd.h
nicodvb
parents:
18679
diff
changeset
|
171 #endif |
bee3186a06f7
include stream_dvd's interface from libmpdemux/stream_dvd.h
nicodvb
parents:
18679
diff
changeset
|
172 |
21200 | 173 #ifdef USE_DVDNAV |
174 #include "stream/stream_dvdnav.h" | |
175 #endif | |
176 | |
5607 | 177 #include "libmpcodecs/dec_audio.h" |
178 #include "libmpcodecs/dec_video.h" | |
8198 | 179 #include "libmpcodecs/mp_image.h" |
180 #include "libmpcodecs/vf.h" | |
17088
f067a9de373c
mplayer.c:1928: warning: implicit declaration of function 'cache_uninit'
rathann
parents:
17057
diff
changeset
|
181 #include "libmpcodecs/vd.h" |
2563 | 182 |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
183 #include "mixer.h" |
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
184 |
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
185 #include "mp_core.h" |
20156 | 186 |
187 //**************************************************************************// | |
1 | 188 //**************************************************************************// |
189 | |
112 | 190 // 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
|
191 #include "mp_fifo.h" |
12816 | 192 int noconsolecontrols=0; |
1 | 193 //**************************************************************************// |
194 | |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
195 // Not all functions in mplayer.c take the context as an argument yet |
22993 | 196 static MPContext mpctx_s = { |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
197 .osd_function = OSD_PLAY, |
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
198 .begin_skip = MP_NOPTS_VALUE, |
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
199 .play_tree_step = 1, |
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
200 .global_sub_pos = -1, |
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
201 .set_of_sub_pos = -1, |
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
202 .file_format = DEMUXER_TYPE_UNKNOWN, |
22281 | 203 #ifdef HAS_DVBIN_SUPPORT |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
204 .last_dvb_step = 1, |
22281 | 205 #endif |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
206 }; |
1 | 207 |
22993 | 208 static MPContext *mpctx = &mpctx_s; |
209 | |
7677
33562a65e9e8
_EXPERIMENTAL_ option: -fixed-vo for libvo spec compliance testing
arpi
parents:
7628
diff
changeset
|
210 int fixed_vo=0; |
33562a65e9e8
_EXPERIMENTAL_ option: -fixed-vo for libvo spec compliance testing
arpi
parents:
7628
diff
changeset
|
211 |
2557 | 212 // benchmark: |
1291 | 213 double video_time_usage=0; |
214 double vout_time_usage=0; | |
1289 | 215 static double audio_time_usage=0; |
216 static int total_time_usage_start=0; | |
5621 | 217 static int total_frame_cnt=0; |
218 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
|
219 int benchmark=0; |
1124
0e95f30ffd4c
-frames and -benchmark options to make chl & gabucino happy
arpi_esp
parents:
1059
diff
changeset
|
220 |
1014
e01dc1a88edf
fixed punkso's mess... local variables moved back to main()
arpi_esp
parents:
1009
diff
changeset
|
221 // options: |
6796 | 222 int auto_quality=0; |
1496 | 223 static int output_quality=0; |
1439 | 224 |
7605
c3bbe602aff3
new option -speed, to set playback speed rate (examples: -speed 1:3 or -speed 5)
arpi
parents:
7604
diff
changeset
|
225 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
|
226 |
1709 | 227 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
|
228 |
64b8c5a07c2c
- It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents:
9217
diff
changeset
|
229 #ifdef HAVE_NEW_GUI |
64b8c5a07c2c
- It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents:
9217
diff
changeset
|
230 int enqueue=0; |
64b8c5a07c2c
- It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents:
9217
diff
changeset
|
231 #endif |
64b8c5a07c2c
- It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents:
9217
diff
changeset
|
232 |
17914
f9cb6fc1608a
Add an option to list the properties: -list-properties
albeu
parents:
17911
diff
changeset
|
233 static int list_properties = 0; |
f9cb6fc1608a
Add an option to list the properties: -list-properties
albeu
parents:
17911
diff
changeset
|
234 |
6921 | 235 int osd_level=1; |
18287
292337d09af2
Remove updating of vo_mouse_timer_const from the main loop and also
uau
parents:
18286
diff
changeset
|
236 // 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
|
237 unsigned int osd_visible; |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
238 int osd_duration = 1000; |
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
239 |
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
240 int term_osd = 1; |
16992
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
241 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
|
242 static char* playing_msg = NULL; |
2557 | 243 // seek: |
22312 | 244 static double seek_to_sec; |
7559
b645204ea527
some cleanup - made private vars/funcs static, removed obsolete externs
arpi
parents:
7529
diff
changeset
|
245 static off_t seek_to_byte=0; |
b645204ea527
some cleanup - made private vars/funcs static, removed obsolete externs
arpi
parents:
7529
diff
changeset
|
246 static off_t step_sec=0; |
b645204ea527
some cleanup - made private vars/funcs static, removed obsolete externs
arpi
parents:
7529
diff
changeset
|
247 static int loop_times=-1; |
8784 | 248 static int loop_seek=0; |
7559
b645204ea527
some cleanup - made private vars/funcs static, removed obsolete externs
arpi
parents:
7529
diff
changeset
|
249 |
19973
02a18c52a42a
after a long time, finally i could add -endpos option to mplayer executable.
ptt
parents:
19946
diff
changeset
|
250 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
|
251 |
7576
c135f7646036
new opt: -autosync, controls ao->get_delay() smoothing (default: disabled)
arpi
parents:
7563
diff
changeset
|
252 // A/V sync: |
8311 | 253 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
|
254 |
7559
b645204ea527
some cleanup - made private vars/funcs static, removed obsolete externs
arpi
parents:
7529
diff
changeset
|
255 // may be changed by GUI: (FIXME!) |
2557 | 256 float rel_seek_secs=0; |
257 int abs_seek_pos=0; | |
258 | |
259 // codecs: | |
7529
c276bfb414fb
removed obsolete/unused audio|video_fm|codec, has_audio|video
arpi
parents:
7526
diff
changeset
|
260 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
|
261 char **video_codec_list=NULL; // override video codec |
7529
c276bfb414fb
removed obsolete/unused audio|video_fm|codec, has_audio|video
arpi
parents:
7526
diff
changeset
|
262 char **audio_fm_list=NULL; // override audio codec family |
7506
c1cb94198e05
-vc/-vfm accepts codec/driver _list_ now. empty list element for -vc means
arpi
parents:
7502
diff
changeset
|
263 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
|
264 |
16175 | 265 // demuxer: |
266 extern char *demuxer_name; // override demuxer | |
267 extern char *audio_demuxer_name; // override audio demuxer | |
268 extern char *sub_demuxer_name; // override sub demuxer | |
269 | |
1014
e01dc1a88edf
fixed punkso's mess... local variables moved back to main()
arpi_esp
parents:
1009
diff
changeset
|
270 // streaming: |
3532 | 271 int audio_id=-1; |
272 int video_id=-1; | |
17379
9d99333ce6ab
dvd subtitles should be disabled by default, and enabled specifying -sid or -slang; this fix also restores the display of other subtitles types when dvd subs are present
nicodvb
parents:
17366
diff
changeset
|
273 int dvdsub_id=-2; |
4079 | 274 int vobsub_id=-1; |
10167
531b00ad6f2d
Support for selecting the audio track in Matroska files via -alang.
mosu
parents:
10116
diff
changeset
|
275 char* audio_lang=NULL; |
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9831
diff
changeset
|
276 char* dvdsub_lang=NULL; |
5388
3af2729c5c87
* New command line switch for mplayer & mencoder:
kmkaplan
parents:
5380
diff
changeset
|
277 static char* spudec_ifo=NULL; |
6627 | 278 char* filename=NULL; //"MI2-Trailer.avi"; |
10917
d45870f67728
Forced subtitles patch by Arne Driescher <driescher@mpi-magdeburg.mpg.de>
attila
parents:
10884
diff
changeset
|
279 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
|
280 int file_filter=1; |
1014
e01dc1a88edf
fixed punkso's mess... local variables moved back to main()
arpi_esp
parents:
1009
diff
changeset
|
281 |
2353 | 282 // cache2: |
7881
aba9301ed3c4
allow cache to be disabled (-nocache should override cachesize autodetection
arpi
parents:
7867
diff
changeset
|
283 int stream_cache_size=-1; |
2353 | 284 #ifdef USE_STREAM_CACHE |
285 extern int cache_fill_status; | |
12835
4235ae5a2d60
cache min fill adjustment, based on patch by Jeremy Huddleston
iive
parents:
12816
diff
changeset
|
286 |
4235ae5a2d60
cache min fill adjustment, based on patch by Jeremy Huddleston
iive
parents:
12816
diff
changeset
|
287 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
|
288 float stream_cache_seek_min_percent=50.0; |
2353 | 289 #else |
290 #define cache_fill_status 0 | |
291 #endif | |
292 | |
2557 | 293 // dump: |
3257 | 294 static char *stream_dump_name="stream.dump"; |
6796 | 295 int stream_dump_type=0; |
2557 | 296 |
297 // A-V sync: | |
1498 | 298 static float default_max_pts_correction=-1;//0.01f; |
299 static float max_pts_correction=0;//default_max_pts_correction; | |
2557 | 300 static float c_total=0; |
6796 | 301 float audio_delay=0; |
17654 | 302 static int ignore_start=0; |
1014
e01dc1a88edf
fixed punkso's mess... local variables moved back to main()
arpi_esp
parents:
1009
diff
changeset
|
303 |
2889
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
304 static int softsleep=0; |
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
305 |
9055 | 306 float force_fps=0; |
2557 | 307 static int force_srate=0; |
20771
1e78e35b6c7b
Change value used to indicate "unknown audio format" from 0 to -1.
uau
parents:
20750
diff
changeset
|
308 static int audio_output_format=-1; // AF_FORMAT_UNKNOWN |
6796 | 309 int frame_dropping=0; // option 0=no drop 1= drop vo 2= drop decode |
2557 | 310 static int play_n_frames=-1; |
6590 | 311 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
|
312 |
1 | 313 // screen info: |
7562
92188b57a062
video out driver list support (like -vc, example: -vo xmga,xv,x11,)
arpi
parents:
7559
diff
changeset
|
314 char** video_driver_list=NULL; |
92188b57a062
video out driver list support (like -vc, example: -vo xmga,xv,x11,)
arpi
parents:
7559
diff
changeset
|
315 char** audio_driver_list=NULL; |
5075 | 316 |
7559
b645204ea527
some cleanup - made private vars/funcs static, removed obsolete externs
arpi
parents:
7529
diff
changeset
|
317 extern char *vo_subdevice; |
b645204ea527
some cleanup - made private vars/funcs static, removed obsolete externs
arpi
parents:
7529
diff
changeset
|
318 extern char *ao_subdevice; |
b645204ea527
some cleanup - made private vars/funcs static, removed obsolete externs
arpi
parents:
7529
diff
changeset
|
319 |
7451
8669e56d2d98
some mpcodecs option declaration moved to cfg-*, as aren;t used by
arpi
parents:
7450
diff
changeset
|
320 // codec outfmt flags (defined in libmpcodecs/vd.c) |
5075 | 321 extern int vo_flags; |
1014
e01dc1a88edf
fixed punkso's mess... local variables moved back to main()
arpi_esp
parents:
1009
diff
changeset
|
322 |
e01dc1a88edf
fixed punkso's mess... local variables moved back to main()
arpi_esp
parents:
1009
diff
changeset
|
323 // sub: |
212 | 324 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
|
325 char *sub_font_name=NULL; |
11580
90953d955165
Fontconfig support based on patch by Arwed von Merkatz <v.merkatz@gmx.net>, but slightly reworked
alex
parents:
11542
diff
changeset
|
326 #ifdef HAVE_FONTCONFIG |
11584 | 327 extern int font_fontconfig; |
11580
90953d955165
Fontconfig support based on patch by Arwed von Merkatz <v.merkatz@gmx.net>, but slightly reworked
alex
parents:
11542
diff
changeset
|
328 #endif |
215 | 329 float font_factor=0.75; |
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9831
diff
changeset
|
330 char **sub_name=NULL; |
258 | 331 float sub_delay=0; |
332 float sub_fps=0; | |
510 | 333 int sub_auto = 1; |
4079 | 334 char *vobsub_name=NULL; |
1255
94f2853ec6f4
-dsp option removed, displaying help text (-ao oss:dsp_path)
alex
parents:
1250
diff
changeset
|
335 /*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
|
336 int subcc_enabled=0; |
8361
2202c00001e3
overlapping subtitles support is now optional, can be disabled (-nooverlapsub)
arpi
parents:
8360
diff
changeset
|
337 int suboverlap_enabled = 1; |
21140 | 338 |
18937
9e95ac641e77
Initial libass release (without mencoder support).
eugeni
parents:
18934
diff
changeset
|
339 #ifdef USE_ASS |
9e95ac641e77
Initial libass release (without mencoder support).
eugeni
parents:
18934
diff
changeset
|
340 #include "libass/ass.h" |
9e95ac641e77
Initial libass release (without mencoder support).
eugeni
parents:
18934
diff
changeset
|
341 #include "libass/ass_mp.h" |
9e95ac641e77
Initial libass release (without mencoder support).
eugeni
parents:
18934
diff
changeset
|
342 #endif |
9e95ac641e77
Initial libass release (without mencoder support).
eugeni
parents:
18934
diff
changeset
|
343 |
17120
637a2f4ff216
Some more cola for msglevel, codec-cfg can't even call mp_msg_init or it'll
ods15
parents:
17109
diff
changeset
|
344 extern int mp_msg_levels[MSGT_MAX]; |
637a2f4ff216
Some more cola for msglevel, codec-cfg can't even call mp_msg_init or it'll
ods15
parents:
17109
diff
changeset
|
345 extern int mp_msg_level_all; |
17106
05af35012e4f
new -msglevel option, constrols msg level for every msg module
ods15
parents:
17088
diff
changeset
|
346 |
4818
3473ca9ef158
new gui interface, and gtk moved into mplayer process. fork ... bleh :)
pontscho
parents:
4807
diff
changeset
|
347 char* current_module=NULL; // for debugging |
1856 | 348 |
6781 | 349 |
6755 | 350 // --- |
351 | |
8198 | 352 #ifdef HAVE_MENU |
353 #include "m_struct.h" | |
354 #include "libmenu/menu.h" | |
355 extern void vf_menu_pause_update(struct vf_instance_s* vf); | |
356 extern vf_info_t vf_info_menu; | |
357 static vf_info_t* libmenu_vfs[] = { | |
358 &vf_info_menu, | |
359 NULL | |
360 }; | |
361 static vf_instance_t* vf_menu = NULL; | |
362 static int use_menu = 0; | |
363 static char* menu_cfg = NULL; | |
364 static char* menu_root = "main"; | |
365 #endif | |
366 | |
367 | |
5055 | 368 #ifdef HAVE_RTC |
19756 | 369 static int nortc = 1; |
12681 | 370 static char* rtc_device; |
5055 | 371 #endif |
372 | |
13858
4178a4eee72c
fixed some doxygen comments, patch by Oded Shimon
reynaldo
parents:
13857
diff
changeset
|
373 edl_record_ptr edl_records = NULL; ///< EDL entries memory area |
4178a4eee72c
fixed some doxygen comments, patch by Oded Shimon
reynaldo
parents:
13857
diff
changeset
|
374 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
|
375 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
|
376 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
|
377 int use_filedir_conf; |
8531
1aa2c9b460af
Merged EDL 0.5 patch - it's something like Quicktime's edit lists.
arpi
parents:
8494
diff
changeset
|
378 |
1856 | 379 static unsigned int inited_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
|
380 #include "mpcommon.h" |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
381 #include "command.h" |
1856 | 382 |
19532
13599373bb02
added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents:
19529
diff
changeset
|
383 #include "metadata.h" |
13599373bb02
added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents:
19529
diff
changeset
|
384 |
13599373bb02
added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents:
19529
diff
changeset
|
385 #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
|
386 |
22284 | 387 void *mpctx_get_video_out(MPContext *mpctx) |
388 { | |
389 return mpctx->video_out; | |
390 } | |
391 | |
22286 | 392 void *mpctx_get_audio_out(MPContext *mpctx) |
393 { | |
22411
cf4c052b6d60
Fix copy-paste bug (must have broken something in the GUI)
uau
parents:
22365
diff
changeset
|
394 return mpctx->audio_out; |
22286 | 395 } |
396 | |
22284 | 397 void *mpctx_get_playtree_iter(MPContext *mpctx) |
398 { | |
399 return mpctx->playtree_iter; | |
400 } | |
401 | |
22286 | 402 void *mpctx_get_mixer(MPContext *mpctx) |
403 { | |
404 return &mpctx->mixer; | |
405 } | |
406 | |
22290 | 407 int mpctx_get_global_sub_size(MPContext *mpctx) |
22286 | 408 { |
409 return mpctx->global_sub_size; | |
410 } | |
411 | |
19532
13599373bb02
added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents:
19529
diff
changeset
|
412 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
|
413 switch (type) |
13599373bb02
added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents:
19529
diff
changeset
|
414 { |
13599373bb02
added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents:
19529
diff
changeset
|
415 /* check for valid video stream */ |
13599373bb02
added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents:
19529
diff
changeset
|
416 case META_VIDEO_CODEC: |
13599373bb02
added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents:
19529
diff
changeset
|
417 case META_VIDEO_BITRATE: |
13599373bb02
added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents:
19529
diff
changeset
|
418 case META_VIDEO_RESOLUTION: |
13599373bb02
added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents:
19529
diff
changeset
|
419 { |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
420 if (!mpctx->sh_video) |
19532
13599373bb02
added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents:
19529
diff
changeset
|
421 return 0; |
13599373bb02
added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents:
19529
diff
changeset
|
422 break; |
13599373bb02
added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents:
19529
diff
changeset
|
423 } |
13599373bb02
added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents:
19529
diff
changeset
|
424 |
13599373bb02
added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents:
19529
diff
changeset
|
425 /* check for valid audio stream */ |
13599373bb02
added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents:
19529
diff
changeset
|
426 case META_AUDIO_CODEC: |
13599373bb02
added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents:
19529
diff
changeset
|
427 case META_AUDIO_BITRATE: |
13599373bb02
added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents:
19529
diff
changeset
|
428 case META_AUDIO_SAMPLES: |
13599373bb02
added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents:
19529
diff
changeset
|
429 { |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
430 if (!mpctx->sh_audio) |
19532
13599373bb02
added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents:
19529
diff
changeset
|
431 return 0; |
13599373bb02
added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents:
19529
diff
changeset
|
432 break; |
13599373bb02
added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents:
19529
diff
changeset
|
433 } |
13599373bb02
added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents:
19529
diff
changeset
|
434 |
13599373bb02
added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents:
19529
diff
changeset
|
435 /* check for valid demuxer */ |
13599373bb02
added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents:
19529
diff
changeset
|
436 case META_INFO_TITLE: |
13599373bb02
added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents:
19529
diff
changeset
|
437 case META_INFO_ARTIST: |
13599373bb02
added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents:
19529
diff
changeset
|
438 case META_INFO_ALBUM: |
13599373bb02
added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents:
19529
diff
changeset
|
439 case META_INFO_YEAR: |
13599373bb02
added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents:
19529
diff
changeset
|
440 case META_INFO_COMMENT: |
13599373bb02
added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents:
19529
diff
changeset
|
441 case META_INFO_TRACK: |
13599373bb02
added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents:
19529
diff
changeset
|
442 case META_INFO_GENRE: |
13599373bb02
added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents:
19529
diff
changeset
|
443 { |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
444 if (!mpctx->demuxer) |
19532
13599373bb02
added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents:
19529
diff
changeset
|
445 return 0; |
13599373bb02
added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents:
19529
diff
changeset
|
446 break; |
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 default: |
13599373bb02
added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents:
19529
diff
changeset
|
450 break; |
13599373bb02
added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents:
19529
diff
changeset
|
451 } |
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 return 1; |
13599373bb02
added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents:
19529
diff
changeset
|
454 } |
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 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
|
457 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
|
458 int n; |
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 if (!info || !tag) |
13599373bb02
added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents:
19529
diff
changeset
|
461 return NULL; |
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 for (n = 0; info[2*n] != NULL ; n++) |
13599373bb02
added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents:
19529
diff
changeset
|
464 if (!strcmp (info[2*n], tag)) |
13599373bb02
added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents:
19529
diff
changeset
|
465 break; |
13599373bb02
added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents:
19529
diff
changeset
|
466 |
13599373bb02
added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents:
19529
diff
changeset
|
467 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
|
468 } |
13599373bb02
added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents:
19529
diff
changeset
|
469 |
13599373bb02
added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents:
19529
diff
changeset
|
470 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
|
471 char *meta = NULL; |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
472 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
|
473 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
|
474 |
13599373bb02
added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents:
19529
diff
changeset
|
475 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
|
476 return NULL; |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
477 |
19532
13599373bb02
added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents:
19529
diff
changeset
|
478 switch (type) |
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 case META_NAME: |
13599373bb02
added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents:
19529
diff
changeset
|
481 { |
13599373bb02
added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents:
19529
diff
changeset
|
482 return strdup (mp_basename2 (filename)); |
13599373bb02
added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents:
19529
diff
changeset
|
483 } |
13599373bb02
added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents:
19529
diff
changeset
|
484 |
13599373bb02
added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents:
19529
diff
changeset
|
485 case META_VIDEO_CODEC: |
13599373bb02
added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents:
19529
diff
changeset
|
486 { |
13599373bb02
added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents:
19529
diff
changeset
|
487 if (sh_video->format == 0x10000001) |
13599373bb02
added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents:
19529
diff
changeset
|
488 meta = strdup ("mpeg1"); |
13599373bb02
added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents:
19529
diff
changeset
|
489 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
|
490 meta = strdup ("mpeg2"); |
13599373bb02
added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents:
19529
diff
changeset
|
491 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
|
492 meta = strdup ("mpeg4"); |
13599373bb02
added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents:
19529
diff
changeset
|
493 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
|
494 meta = strdup ("h264"); |
13599373bb02
added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents:
19529
diff
changeset
|
495 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
|
496 { |
13599373bb02
added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents:
19529
diff
changeset
|
497 meta = (char *) malloc (8); |
13599373bb02
added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents:
19529
diff
changeset
|
498 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
|
499 } |
13599373bb02
added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents:
19529
diff
changeset
|
500 else |
13599373bb02
added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents:
19529
diff
changeset
|
501 { |
13599373bb02
added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents:
19529
diff
changeset
|
502 meta = (char *) malloc (8); |
13599373bb02
added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents:
19529
diff
changeset
|
503 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
|
504 } |
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 } |
13599373bb02
added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents:
19529
diff
changeset
|
507 |
13599373bb02
added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents:
19529
diff
changeset
|
508 case META_VIDEO_BITRATE: |
13599373bb02
added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents:
19529
diff
changeset
|
509 { |
13599373bb02
added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents:
19529
diff
changeset
|
510 meta = (char *) malloc (16); |
13599373bb02
added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents:
19529
diff
changeset
|
511 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
|
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_VIDEO_RESOLUTION: |
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 meta = (char *) malloc (16); |
13599373bb02
added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents:
19529
diff
changeset
|
518 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
|
519 return meta; |
13599373bb02
added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents:
19529
diff
changeset
|
520 } |
13599373bb02
added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents:
19529
diff
changeset
|
521 |
13599373bb02
added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents:
19529
diff
changeset
|
522 case META_AUDIO_CODEC: |
13599373bb02
added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents:
19529
diff
changeset
|
523 { |
13599373bb02
added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents:
19529
diff
changeset
|
524 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
|
525 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
|
526 return meta; |
13599373bb02
added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents:
19529
diff
changeset
|
527 } |
13599373bb02
added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents:
19529
diff
changeset
|
528 |
13599373bb02
added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents:
19529
diff
changeset
|
529 case META_AUDIO_BITRATE: |
13599373bb02
added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents:
19529
diff
changeset
|
530 { |
13599373bb02
added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents:
19529
diff
changeset
|
531 meta = (char *) malloc (16); |
13599373bb02
added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents:
19529
diff
changeset
|
532 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
|
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 case META_AUDIO_SAMPLES: |
13599373bb02
added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents:
19529
diff
changeset
|
537 { |
13599373bb02
added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents:
19529
diff
changeset
|
538 meta = (char *) malloc (16); |
13599373bb02
added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents:
19529
diff
changeset
|
539 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
|
540 return meta; |
13599373bb02
added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents:
19529
diff
changeset
|
541 } |
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 /* check for valid demuxer */ |
13599373bb02
added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents:
19529
diff
changeset
|
544 case META_INFO_TITLE: |
13599373bb02
added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents:
19529
diff
changeset
|
545 return get_demuxer_info ("Title"); |
13599373bb02
added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents:
19529
diff
changeset
|
546 |
13599373bb02
added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents:
19529
diff
changeset
|
547 case META_INFO_ARTIST: |
13599373bb02
added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents:
19529
diff
changeset
|
548 return get_demuxer_info ("Artist"); |
13599373bb02
added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents:
19529
diff
changeset
|
549 |
13599373bb02
added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents:
19529
diff
changeset
|
550 case META_INFO_ALBUM: |
13599373bb02
added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents:
19529
diff
changeset
|
551 return get_demuxer_info ("Album"); |
13599373bb02
added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents:
19529
diff
changeset
|
552 |
13599373bb02
added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents:
19529
diff
changeset
|
553 case META_INFO_YEAR: |
13599373bb02
added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents:
19529
diff
changeset
|
554 return get_demuxer_info ("Year"); |
13599373bb02
added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents:
19529
diff
changeset
|
555 |
13599373bb02
added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents:
19529
diff
changeset
|
556 case META_INFO_COMMENT: |
13599373bb02
added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents:
19529
diff
changeset
|
557 return get_demuxer_info ("Comment"); |
13599373bb02
added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents:
19529
diff
changeset
|
558 |
13599373bb02
added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents:
19529
diff
changeset
|
559 case META_INFO_TRACK: |
13599373bb02
added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents:
19529
diff
changeset
|
560 return get_demuxer_info ("Track"); |
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 case META_INFO_GENRE: |
13599373bb02
added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents:
19529
diff
changeset
|
563 return get_demuxer_info ("Genre"); |
13599373bb02
added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents:
19529
diff
changeset
|
564 |
13599373bb02
added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents:
19529
diff
changeset
|
565 default: |
13599373bb02
added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents:
19529
diff
changeset
|
566 break; |
13599373bb02
added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents:
19529
diff
changeset
|
567 } |
13599373bb02
added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents:
19529
diff
changeset
|
568 |
13599373bb02
added new helpers to allow easy metadata retrieval and make libmenu use them
ben
parents:
19529
diff
changeset
|
569 return meta; |
19529
9a59c33bee29
new option for libmenu that allow display of properties and metadata of currently played stream
ben
parents:
19521
diff
changeset
|
570 } |
9a59c33bee29
new option for libmenu that allow display of properties and metadata of currently played stream
ben
parents:
19521
diff
changeset
|
571 |
21802 | 572 /// step size of mixer changes |
573 int volstep = 3; | |
574 | |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
575 void uninit_player(unsigned int mask){ |
1856 | 576 mask=inited_flags&mask; |
5154 | 577 |
578 mp_msg(MSGT_CPLAYER,MSGL_DBG2,"\n*** uninit(0x%X)\n",mask); | |
579 | |
7621
7caeb275ad26
uninit cleanup again... thx to Nilmoni Deb for bugreport
arpi
parents:
7614
diff
changeset
|
580 if(mask&INITED_ACODEC){ |
7caeb275ad26
uninit cleanup again... thx to Nilmoni Deb for bugreport
arpi
parents:
7614
diff
changeset
|
581 inited_flags&=~INITED_ACODEC; |
7caeb275ad26
uninit cleanup again... thx to Nilmoni Deb for bugreport
arpi
parents:
7614
diff
changeset
|
582 current_module="uninit_acodec"; |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
583 if(mpctx->sh_audio) uninit_audio(mpctx->sh_audio); |
14254 | 584 #ifdef HAVE_NEW_GUI |
22285 | 585 if (use_gui) guiGetEvent(guiSetAfilter, (char *)NULL); |
14254 | 586 #endif |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
587 mpctx->sh_audio=NULL; |
7621
7caeb275ad26
uninit cleanup again... thx to Nilmoni Deb for bugreport
arpi
parents:
7614
diff
changeset
|
588 } |
7caeb275ad26
uninit cleanup again... thx to Nilmoni Deb for bugreport
arpi
parents:
7614
diff
changeset
|
589 |
7caeb275ad26
uninit cleanup again... thx to Nilmoni Deb for bugreport
arpi
parents:
7614
diff
changeset
|
590 if(mask&INITED_VCODEC){ |
7caeb275ad26
uninit cleanup again... thx to Nilmoni Deb for bugreport
arpi
parents:
7614
diff
changeset
|
591 inited_flags&=~INITED_VCODEC; |
7caeb275ad26
uninit cleanup again... thx to Nilmoni Deb for bugreport
arpi
parents:
7614
diff
changeset
|
592 current_module="uninit_vcodec"; |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
593 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
|
594 mpctx->sh_video=NULL; |
8198 | 595 #ifdef HAVE_MENU |
596 vf_menu=NULL; | |
597 #endif | |
7621
7caeb275ad26
uninit cleanup again... thx to Nilmoni Deb for bugreport
arpi
parents:
7614
diff
changeset
|
598 } |
7caeb275ad26
uninit cleanup again... thx to Nilmoni Deb for bugreport
arpi
parents:
7614
diff
changeset
|
599 |
7caeb275ad26
uninit cleanup again... thx to Nilmoni Deb for bugreport
arpi
parents:
7614
diff
changeset
|
600 if(mask&INITED_DEMUXER){ |
7caeb275ad26
uninit cleanup again... thx to Nilmoni Deb for bugreport
arpi
parents:
7614
diff
changeset
|
601 inited_flags&=~INITED_DEMUXER; |
7caeb275ad26
uninit cleanup again... thx to Nilmoni Deb for bugreport
arpi
parents:
7614
diff
changeset
|
602 current_module="free_demuxer"; |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
603 if(mpctx->demuxer){ |
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
604 mpctx->stream=mpctx->demuxer->stream; |
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
605 free_demuxer(mpctx->demuxer); |
8023 | 606 } |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
607 mpctx->demuxer=NULL; |
7621
7caeb275ad26
uninit cleanup again... thx to Nilmoni Deb for bugreport
arpi
parents:
7614
diff
changeset
|
608 } |
7caeb275ad26
uninit cleanup again... thx to Nilmoni Deb for bugreport
arpi
parents:
7614
diff
changeset
|
609 |
5830
4c17a92220fc
uninit libvo before getch2 - requires for clean svgalib uninit
arpi
parents:
5798
diff
changeset
|
610 // kill the cache process: |
5154 | 611 if(mask&INITED_STREAM){ |
612 inited_flags&=~INITED_STREAM; | |
613 current_module="uninit_stream"; | |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
614 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
|
615 mpctx->stream=NULL; |
5154 | 616 } |
617 | |
5830
4c17a92220fc
uninit libvo before getch2 - requires for clean svgalib uninit
arpi
parents:
5798
diff
changeset
|
618 if(mask&INITED_VO){ |
4c17a92220fc
uninit libvo before getch2 - requires for clean svgalib uninit
arpi
parents:
5798
diff
changeset
|
619 inited_flags&=~INITED_VO; |
4c17a92220fc
uninit libvo before getch2 - requires for clean svgalib uninit
arpi
parents:
5798
diff
changeset
|
620 current_module="uninit_vo"; |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
621 mpctx->video_out->uninit(); |
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
622 mpctx->video_out=NULL; |
5830
4c17a92220fc
uninit libvo before getch2 - requires for clean svgalib uninit
arpi
parents:
5798
diff
changeset
|
623 } |
4c17a92220fc
uninit libvo before getch2 - requires for clean svgalib uninit
arpi
parents:
5798
diff
changeset
|
624 |
18316
b3be7df634b0
spelling/grammar/wording fixes in doxygen and non-doxygen comments
diego
parents:
18315
diff
changeset
|
625 // Must be after libvo uninit, as few vo drivers (svgalib) have tty code. |
5154 | 626 if(mask&INITED_GETCH2){ |
627 inited_flags&=~INITED_GETCH2; | |
628 current_module="uninit_getch2"; | |
629 mp_msg(MSGT_CPLAYER,MSGL_DBG2,"\n[[[uninit getch2]]]\n"); | |
630 // restore terminal: | |
631 getch2_disable(); | |
632 } | |
633 | |
6110 | 634 if(mask&INITED_VOBSUB){ |
635 inited_flags&=~INITED_VOBSUB; | |
636 current_module="uninit_vobsub"; | |
7621
7caeb275ad26
uninit cleanup again... thx to Nilmoni Deb for bugreport
arpi
parents:
7614
diff
changeset
|
637 if(vo_vobsub) vobsub_close(vo_vobsub); |
6110 | 638 vo_vobsub=NULL; |
639 } | |
640 | |
3034
24d3dca4e813
DVD sub patch by Kim Minh Kaplan <kmkaplan@selfoffice.com>
arpi
parents:
3015
diff
changeset
|
641 if (mask&INITED_SPUDEC){ |
24d3dca4e813
DVD sub patch by Kim Minh Kaplan <kmkaplan@selfoffice.com>
arpi
parents:
3015
diff
changeset
|
642 inited_flags&=~INITED_SPUDEC; |
24d3dca4e813
DVD sub patch by Kim Minh Kaplan <kmkaplan@selfoffice.com>
arpi
parents:
3015
diff
changeset
|
643 current_module="uninit_spudec"; |
24d3dca4e813
DVD sub patch by Kim Minh Kaplan <kmkaplan@selfoffice.com>
arpi
parents:
3015
diff
changeset
|
644 spudec_free(vo_spudec); |
5411 | 645 vo_spudec=NULL; |
3034
24d3dca4e813
DVD sub patch by Kim Minh Kaplan <kmkaplan@selfoffice.com>
arpi
parents:
3015
diff
changeset
|
646 } |
5488
3f183ca22747
fixed SPU pts, it's 1024/90000 based instead of 1/100
arpi
parents:
5463
diff
changeset
|
647 |
1856 | 648 if(mask&INITED_AO){ |
649 inited_flags&=~INITED_AO; | |
650 current_module="uninit_ao"; | |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
651 if (mpctx->user_muted | mpctx->edl_muted) mixer_mute(&mpctx->mixer); |
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
652 mpctx->audio_out->uninit(mpctx->eof?0:1); mpctx->audio_out=NULL; |
1856 | 653 } |
654 | |
655 #ifdef HAVE_NEW_GUI | |
656 if(mask&INITED_GUI){ | |
657 inited_flags&=~INITED_GUI; | |
658 current_module="uninit_gui"; | |
4818
3473ca9ef158
new gui interface, and gtk moved into mplayer process. fork ... bleh :)
pontscho
parents:
4807
diff
changeset
|
659 guiDone(); |
1856 | 660 } |
661 #endif | |
662 | |
5830
4c17a92220fc
uninit libvo before getch2 - requires for clean svgalib uninit
arpi
parents:
5798
diff
changeset
|
663 if(mask&INITED_INPUT){ |
6429 | 664 inited_flags&=~INITED_INPUT; |
5830
4c17a92220fc
uninit libvo before getch2 - requires for clean svgalib uninit
arpi
parents:
5798
diff
changeset
|
665 current_module="uninit_input"; |
4c17a92220fc
uninit libvo before getch2 - requires for clean svgalib uninit
arpi
parents:
5798
diff
changeset
|
666 mp_input_uninit(); |
4c17a92220fc
uninit libvo before getch2 - requires for clean svgalib uninit
arpi
parents:
5798
diff
changeset
|
667 } |
4431 | 668 |
1863 | 669 current_module=NULL; |
1856 | 670 } |
671 | |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
672 void exit_player_with_rc(const char* how, int rc){ |
1156 | 673 |
1856 | 674 uninit_player(INITED_ALL); |
10661
49d7d02f4485
X11_FULLSCREEN vs HAVE_X11 definitions and some warning fixes
alex
parents:
10646
diff
changeset
|
675 #ifdef HAVE_X11 |
6016 | 676 #ifdef HAVE_NEW_GUI |
677 if ( !use_gui ) | |
678 #endif | |
18316
b3be7df634b0
spelling/grammar/wording fixes in doxygen and non-doxygen comments
diego
parents:
18315
diff
changeset
|
679 vo_uninit(); // Close the X11 connection (if any is open). |
6015 | 680 #endif |
1723
5e4214a7540e
GUI stuff. now seeking works, and xmga renders to video window
arpi
parents:
1709
diff
changeset
|
681 |
13956
5d8f11a627ae
free freetype descriptor and library and mconfig data right before exit
iive
parents:
13946
diff
changeset
|
682 #ifdef HAVE_FREETYPE |
5d8f11a627ae
free freetype descriptor and library and mconfig data right before exit
iive
parents:
13946
diff
changeset
|
683 current_module="uninit_font"; |
5d8f11a627ae
free freetype descriptor and library and mconfig data right before exit
iive
parents:
13946
diff
changeset
|
684 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
|
685 vo_font = NULL; |
5d8f11a627ae
free freetype descriptor and library and mconfig data right before exit
iive
parents:
13946
diff
changeset
|
686 done_freetype(); |
5d8f11a627ae
free freetype descriptor and library and mconfig data right before exit
iive
parents:
13946
diff
changeset
|
687 #endif |
16036 | 688 free_osd_list(); |
13956
5d8f11a627ae
free freetype descriptor and library and mconfig data right before exit
iive
parents:
13946
diff
changeset
|
689 |
20477 | 690 #ifdef USE_ASS |
691 ass_library_done(ass_library); | |
692 #endif | |
693 | |
1856 | 694 current_module="exit_player"; |
1156 | 695 |
13956
5d8f11a627ae
free freetype descriptor and library and mconfig data right before exit
iive
parents:
13946
diff
changeset
|
696 // free mplayer config |
16036 | 697 if(mconfig) |
698 m_config_free(mconfig); | |
699 | |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
700 if(mpctx->playtree) |
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
701 play_tree_free(mpctx->playtree, 1); |
16036 | 702 |
13956
5d8f11a627ae
free freetype descriptor and library and mconfig data right before exit
iive
parents:
13946
diff
changeset
|
703 |
13358
567875b88aab
Hardcoded EDL messages moved to help_mp-en.h, Doxygen comments added, patch
diego
parents:
13353
diff
changeset
|
704 if(edl_records != NULL) free(edl_records); // free mem allocated for EDL |
18002 | 705 if(how) mp_msg(MSGT_CPLAYER,MSGL_INFO,MSGTR_ExitingHow,how); |
4733
5bad0d74f6ea
standard key support for video out runtime fullscreen switching
alex
parents:
4693
diff
changeset
|
706 mp_msg(MSGT_CPLAYER,MSGL_DBG2,"max framesize was %d bytes\n",max_framesize); |
1639 | 707 |
8644
0bfd73828e33
This patch fixes so that the exit code (or return code if you like) is set
arpi
parents:
8635
diff
changeset
|
708 exit(rc); |
0bfd73828e33
This patch fixes so that the exit code (or return code if you like) is set
arpi
parents:
8635
diff
changeset
|
709 } |
0bfd73828e33
This patch fixes so that the exit code (or return code if you like) is set
arpi
parents:
8635
diff
changeset
|
710 |
19104
2ec2301183cd
marks several read-only string parameters which aren't modified inside the called function as const. Patch by Stefan Huehner, stefan AT huehner-org
reynaldo
parents:
19053
diff
changeset
|
711 void exit_player(const char* how){ |
8644
0bfd73828e33
This patch fixes so that the exit code (or return code if you like) is set
arpi
parents:
8635
diff
changeset
|
712 exit_player_with_rc(how, 1); |
1156 | 713 } |
714 | |
13391 | 715 #ifndef __MINGW32__ |
716 static void child_sighandler(int x){ | |
717 pid_t pid; | |
718 while((pid=waitpid(-1,NULL,WNOHANG)) > 0); | |
719 } | |
720 #endif | |
721 | |
13794 | 722 #ifdef CRASH_DEBUG |
723 static char *prog_path; | |
724 static int crash_debug = 0; | |
725 #endif | |
726 | |
7559
b645204ea527
some cleanup - made private vars/funcs static, removed obsolete externs
arpi
parents:
7529
diff
changeset
|
727 static void exit_sighandler(int x){ |
1156 | 728 static int sig_count=0; |
13794 | 729 #ifdef CRASH_DEBUG |
730 if (!crash_debug || x != SIGTRAP) | |
731 #endif | |
1156 | 732 ++sig_count; |
13298 | 733 if(inited_flags==0 && sig_count>1) exit(1); |
734 if(sig_count==5) | |
735 { | |
736 /* We're crashing bad and can't uninit cleanly :( | |
737 * by popular request, we make one last (dirty) | |
738 * effort to restore the user's | |
739 * terminal. */ | |
740 getch2_disable(); | |
741 exit(1); | |
742 } | |
743 if(sig_count==6) exit(1); | |
744 if(sig_count>6){ | |
1156 | 745 // can't stop :( |
9831 | 746 #ifndef __MINGW32__ |
1156 | 747 kill(getpid(),SIGKILL); |
9831 | 748 #endif |
1156 | 749 } |
5127 | 750 mp_msg(MSGT_CPLAYER,MSGL_FATAL,"\n" MSGTR_IntBySignal,x, |
18003 | 751 current_module?current_module:"unknown" |
1156 | 752 ); |
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
|
753 mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_SIGNAL=%d\n", x); |
13794 | 754 if(sig_count<=1) |
5127 | 755 switch(x){ |
756 case SIGINT: | |
757 case SIGQUIT: | |
758 case SIGTERM: | |
759 case SIGKILL: | |
760 break; // killed from keyboard (^C) or killed [-9] | |
761 case SIGILL: | |
5129 | 762 #ifdef RUNTIME_CPUDETECT |
8913
f01a53c8de14
Signal handler messages moved to help_mp, so they can be translated
rtognimp
parents:
8819
diff
changeset
|
763 mp_msg(MSGT_CPLAYER,MSGL_FATAL,MSGTR_Exit_SIGILL_RTCpuSel); |
5129 | 764 #else |
8913
f01a53c8de14
Signal handler messages moved to help_mp, so they can be translated
rtognimp
parents:
8819
diff
changeset
|
765 mp_msg(MSGT_CPLAYER,MSGL_FATAL,MSGTR_Exit_SIGILL); |
5129 | 766 #endif |
5127 | 767 case SIGFPE: |
768 case SIGSEGV: | |
8913
f01a53c8de14
Signal handler messages moved to help_mp, so they can be translated
rtognimp
parents:
8819
diff
changeset
|
769 mp_msg(MSGT_CPLAYER,MSGL_FATAL,MSGTR_Exit_SIGSEGV_SIGFPE); |
5127 | 770 default: |
8913
f01a53c8de14
Signal handler messages moved to help_mp, so they can be translated
rtognimp
parents:
8819
diff
changeset
|
771 mp_msg(MSGT_CPLAYER,MSGL_FATAL,MSGTR_Exit_SIGCRASH); |
13794 | 772 #ifdef CRASH_DEBUG |
773 if (crash_debug) { | |
774 int gdb_pid; | |
775 char spid[20]; | |
776 snprintf(spid, 19, "%i", getpid()); | |
777 spid[19] = 0; | |
778 mp_msg(MSGT_CPLAYER, MSGL_INFO, "Forking...\n"); | |
779 gdb_pid = fork(); | |
780 mp_msg(MSGT_CPLAYER, MSGL_INFO, "Forked...\n"); | |
781 if (gdb_pid == 0) { // We are the child | |
782 if (execlp("gdb", "gdb", prog_path, spid, NULL) == -1) | |
783 mp_msg(MSGT_CPLAYER, MSGL_ERR, "Couldn't start gdb\n"); | |
784 } else if (gdb_pid < 0) | |
785 mp_msg(MSGT_CPLAYER, MSGL_ERR, "Couldn't fork\n"); | |
786 else { | |
787 waitpid(gdb_pid, NULL, 0); | |
788 } | |
789 if (x == SIGTRAP) return; | |
790 } | |
791 #endif | |
5127 | 792 } |
1156 | 793 exit_player(NULL); |
794 } | |
795 | |
7867 | 796 extern void mp_input_register_options(m_config_t* cfg); |
4659 | 797 |
147 | 798 #include "cfg-mplayer.h" |
1 | 799 |
18888
ab29b3c4f94e
parse_cfgfiles as static in mplayer.c/mencoder.c, patch by Stefan Huehner, stefan AT huehner-org
reynaldo
parents:
18857
diff
changeset
|
800 static void parse_cfgfiles( m_config_t* conf ) |
723 | 801 { |
1014
e01dc1a88edf
fixed punkso's mess... local variables moved back to main()
arpi_esp
parents:
1009
diff
changeset
|
802 char *conffile; |
e01dc1a88edf
fixed punkso's mess... local variables moved back to main()
arpi_esp
parents:
1009
diff
changeset
|
803 int conffile_fd; |
10272
7b0bc557987b
renames: DATADIR->MPLAYER_DATADIR, CONFDIR->MPLAYER_CONFDIR, LIBDIR->MPLAYER_LIBDIR
arpi
parents:
10240
diff
changeset
|
804 if (m_config_parse_config_file(conf, MPLAYER_CONFDIR "/mplayer.conf") < 0) |
13500 | 805 exit_player(NULL); |
178 | 806 if ((conffile = get_path("")) == NULL) { |
1583 | 807 mp_msg(MSGT_CPLAYER,MSGL_WARN,MSGTR_NoHomeDir); |
147 | 808 } else { |
9831 | 809 #ifdef __MINGW32__ |
810 mkdir(conffile); | |
811 #else | |
178 | 812 mkdir(conffile, 0777); |
9831 | 813 #endif |
178 | 814 free(conffile); |
815 if ((conffile = get_path("config")) == NULL) { | |
1583 | 816 mp_msg(MSGT_CPLAYER,MSGL_ERR,MSGTR_GetpathProblem); |
178 | 817 } else { |
818 if ((conffile_fd = open(conffile, O_CREAT | O_EXCL | O_WRONLY, 0666)) != -1) { | |
1582 | 819 mp_msg(MSGT_CPLAYER,MSGL_INFO,MSGTR_CreatingCfgFile, conffile); |
178 | 820 write(conffile_fd, default_config, strlen(default_config)); |
821 close(conffile_fd); | |
822 } | |
4156
22fadd4022b5
playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents:
4152
diff
changeset
|
823 if (m_config_parse_config_file(conf, conffile) < 0) |
13500 | 824 exit_player(NULL); |
178 | 825 free(conffile); |
151 | 826 } |
1 | 827 } |
828 } | |
829 | |
8614
49e36bf2f342
The patch adds support for a per-file config, which is loaded before
arpi
parents:
8612
diff
changeset
|
830 void load_per_file_config (m_config_t* conf, const char *const file) |
49e36bf2f342
The patch adds support for a per-file config, which is loaded before
arpi
parents:
8612
diff
changeset
|
831 { |
49e36bf2f342
The patch adds support for a per-file config, which is loaded before
arpi
parents:
8612
diff
changeset
|
832 char *confpath; |
8634 | 833 char cfg[strlen(file)+10]; |
8614
49e36bf2f342
The patch adds support for a per-file config, which is loaded before
arpi
parents:
8612
diff
changeset
|
834 struct stat st; |
49e36bf2f342
The patch adds support for a per-file config, which is loaded before
arpi
parents:
8612
diff
changeset
|
835 char *name; |
49e36bf2f342
The patch adds support for a per-file config, which is loaded before
arpi
parents:
8612
diff
changeset
|
836 |
49e36bf2f342
The patch adds support for a per-file config, which is loaded before
arpi
parents:
8612
diff
changeset
|
837 sprintf (cfg, "%s.conf", file); |
49e36bf2f342
The patch adds support for a per-file config, which is loaded before
arpi
parents:
8612
diff
changeset
|
838 |
20251
2971196cd8c6
Disable loading of file-specific configuration file from the same
rtogni
parents:
20207
diff
changeset
|
839 if (use_filedir_conf && !stat (cfg, &st)) |
8614
49e36bf2f342
The patch adds support for a per-file config, which is loaded before
arpi
parents:
8612
diff
changeset
|
840 { |
13577 | 841 mp_msg(MSGT_CPLAYER,MSGL_INFO,MSGTR_LoadingConfig, cfg); |
8614
49e36bf2f342
The patch adds support for a per-file config, which is loaded before
arpi
parents:
8612
diff
changeset
|
842 m_config_parse_config_file (conf, cfg); |
49e36bf2f342
The patch adds support for a per-file config, which is loaded before
arpi
parents:
8612
diff
changeset
|
843 return; |
49e36bf2f342
The patch adds support for a per-file config, which is loaded before
arpi
parents:
8612
diff
changeset
|
844 } |
49e36bf2f342
The patch adds support for a per-file config, which is loaded before
arpi
parents:
8612
diff
changeset
|
845 |
49e36bf2f342
The patch adds support for a per-file config, which is loaded before
arpi
parents:
8612
diff
changeset
|
846 if ((name = strrchr (cfg, '/')) == NULL) |
49e36bf2f342
The patch adds support for a per-file config, which is loaded before
arpi
parents:
8612
diff
changeset
|
847 name = cfg; |
49e36bf2f342
The patch adds support for a per-file config, which is loaded before
arpi
parents:
8612
diff
changeset
|
848 else |
49e36bf2f342
The patch adds support for a per-file config, which is loaded before
arpi
parents:
8612
diff
changeset
|
849 name++; |
49e36bf2f342
The patch adds support for a per-file config, which is loaded before
arpi
parents:
8612
diff
changeset
|
850 |
49e36bf2f342
The patch adds support for a per-file config, which is loaded before
arpi
parents:
8612
diff
changeset
|
851 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
|
852 { |
49e36bf2f342
The patch adds support for a per-file config, which is loaded before
arpi
parents:
8612
diff
changeset
|
853 if (!stat (confpath, &st)) |
49e36bf2f342
The patch adds support for a per-file config, which is loaded before
arpi
parents:
8612
diff
changeset
|
854 { |
13577 | 855 mp_msg(MSGT_CPLAYER,MSGL_INFO,MSGTR_LoadingConfig, confpath); |
8614
49e36bf2f342
The patch adds support for a per-file config, which is loaded before
arpi
parents:
8612
diff
changeset
|
856 m_config_parse_config_file (conf, confpath); |
49e36bf2f342
The patch adds support for a per-file config, which is loaded before
arpi
parents:
8612
diff
changeset
|
857 } |
49e36bf2f342
The patch adds support for a per-file config, which is loaded before
arpi
parents:
8612
diff
changeset
|
858 |
49e36bf2f342
The patch adds support for a per-file config, which is loaded before
arpi
parents:
8612
diff
changeset
|
859 free (confpath); |
49e36bf2f342
The patch adds support for a per-file config, which is loaded before
arpi
parents:
8612
diff
changeset
|
860 } |
49e36bf2f342
The patch adds support for a per-file config, which is loaded before
arpi
parents:
8612
diff
changeset
|
861 } |
49e36bf2f342
The patch adds support for a per-file config, which is loaded before
arpi
parents:
8612
diff
changeset
|
862 |
18316
b3be7df634b0
spelling/grammar/wording fixes in doxygen and non-doxygen comments
diego
parents:
18315
diff
changeset
|
863 /* 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
|
864 * 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
|
865 * if it was interrupted by the user. |
b3be7df634b0
spelling/grammar/wording fixes in doxygen and non-doxygen comments
diego
parents:
18315
diff
changeset
|
866 * 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
|
867 static int libmpdemux_was_interrupted(int eof) { |
41d2da3bd082
Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents:
4818
diff
changeset
|
868 mp_cmd_t* cmd; |
13603 | 869 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
|
870 switch(cmd->id) { |
41d2da3bd082
Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents:
4818
diff
changeset
|
871 case MP_CMD_QUIT: |
13338
1820ef597cdb
quit slave mode command now accepts an exit value, patch by Aurelien Jacobs <aurel at gnuage.org>
faust3
parents:
13298
diff
changeset
|
872 exit_player_with_rc(MSGTR_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
|
873 case MP_CMD_PLAY_TREE_STEP: { |
41d2da3bd082
Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents:
4818
diff
changeset
|
874 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
|
875 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
|
876 } break; |
41d2da3bd082
Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents:
4818
diff
changeset
|
877 case MP_CMD_PLAY_TREE_UP_STEP: { |
41d2da3bd082
Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents:
4818
diff
changeset
|
878 eof = (cmd->args[0].v.i > 0) ? PT_UP_NEXT : PT_UP_PREV; |
41d2da3bd082
Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents:
4818
diff
changeset
|
879 } break; |
41d2da3bd082
Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents:
4818
diff
changeset
|
880 case MP_CMD_PLAY_ALT_SRC_STEP: { |
41d2da3bd082
Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents:
4818
diff
changeset
|
881 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
|
882 } break; |
41d2da3bd082
Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents:
4818
diff
changeset
|
883 } |
41d2da3bd082
Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents:
4818
diff
changeset
|
884 mp_cmd_free(cmd); |
41d2da3bd082
Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents:
4818
diff
changeset
|
885 } |
41d2da3bd082
Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents:
4818
diff
changeset
|
886 return eof; |
41d2da3bd082
Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents:
4818
diff
changeset
|
887 } |
41d2da3bd082
Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents:
4818
diff
changeset
|
888 |
13010 | 889 #define mp_basename(s) (strrchr(s,'\\')==NULL?(mp_basename2(s)):(strrchr(s,'\\')+1)) |
8937 | 890 |
8925
5c15777f1c07
this patch adds an fallback to playlist (any but the plaintext-list format)
arpi
parents:
8913
diff
changeset
|
891 int playtree_add_playlist(play_tree_t* entry) |
5c15777f1c07
this patch adds an fallback to playlist (any but the plaintext-list format)
arpi
parents:
8913
diff
changeset
|
892 { |
9301
7841308ad250
this patch fixes latest bug, discovered by .so ... (relative filenames &
arpi
parents:
9291
diff
changeset
|
893 play_tree_add_bpf(entry,filename); |
7841308ad250
this patch fixes latest bug, discovered by .so ... (relative filenames &
arpi
parents:
9291
diff
changeset
|
894 |
9291
64b8c5a07c2c
- It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents:
9217
diff
changeset
|
895 #ifdef HAVE_NEW_GUI |
64b8c5a07c2c
- It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents:
9217
diff
changeset
|
896 if (use_gui) { |
64b8c5a07c2c
- It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents:
9217
diff
changeset
|
897 if (entry) { |
64b8c5a07c2c
- It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents:
9217
diff
changeset
|
898 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
|
899 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
|
900 } |
64b8c5a07c2c
- It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents:
9217
diff
changeset
|
901 } else |
64b8c5a07c2c
- It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents:
9217
diff
changeset
|
902 #endif |
64b8c5a07c2c
- It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents:
9217
diff
changeset
|
903 { |
8925
5c15777f1c07
this patch adds an fallback to playlist (any but the plaintext-list format)
arpi
parents:
8913
diff
changeset
|
904 if(!entry) { |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
905 entry = mpctx->playtree_iter->tree; |
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
906 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
|
907 return PT_NEXT_ENTRY; |
5c15777f1c07
this patch adds an fallback to playlist (any but the plaintext-list format)
arpi
parents:
8913
diff
changeset
|
908 } |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
909 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
|
910 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
|
911 return PT_NEXT_ENTRY; |
5c15777f1c07
this patch adds an fallback to playlist (any but the plaintext-list format)
arpi
parents:
8913
diff
changeset
|
912 } |
5c15777f1c07
this patch adds an fallback to playlist (any but the plaintext-list format)
arpi
parents:
8913
diff
changeset
|
913 } |
5c15777f1c07
this patch adds an fallback to playlist (any but the plaintext-list format)
arpi
parents:
8913
diff
changeset
|
914 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
|
915 return PT_NEXT_SRC; |
5c15777f1c07
this patch adds an fallback to playlist (any but the plaintext-list format)
arpi
parents:
8913
diff
changeset
|
916 } |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
917 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
|
918 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
|
919 entry = mpctx->playtree_iter->tree; |
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
920 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
|
921 return PT_NEXT_ENTRY; |
5c15777f1c07
this patch adds an fallback to playlist (any but the plaintext-list format)
arpi
parents:
8913
diff
changeset
|
922 } |
5c15777f1c07
this patch adds an fallback to playlist (any but the plaintext-list format)
arpi
parents:
8913
diff
changeset
|
923 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
|
924 } |
8925
5c15777f1c07
this patch adds an fallback to playlist (any but the plaintext-list format)
arpi
parents:
8913
diff
changeset
|
925 return PT_NEXT_SRC; |
5c15777f1c07
this patch adds an fallback to playlist (any but the plaintext-list format)
arpi
parents:
8913
diff
changeset
|
926 } |
5c15777f1c07
this patch adds an fallback to playlist (any but the plaintext-list format)
arpi
parents:
8913
diff
changeset
|
927 |
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9831
diff
changeset
|
928 void add_subtitles(char *filename, float fps, int silent) |
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9831
diff
changeset
|
929 { |
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9831
diff
changeset
|
930 sub_data *subd; |
18937
9e95ac641e77
Initial libass release (without mencoder support).
eugeni
parents:
18934
diff
changeset
|
931 #ifdef USE_ASS |
9e95ac641e77
Initial libass release (without mencoder support).
eugeni
parents:
18934
diff
changeset
|
932 ass_track_t *asst = 0; |
9e95ac641e77
Initial libass release (without mencoder support).
eugeni
parents:
18934
diff
changeset
|
933 #endif |
9e95ac641e77
Initial libass release (without mencoder support).
eugeni
parents:
18934
diff
changeset
|
934 |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
935 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
|
936 return; |
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9831
diff
changeset
|
937 } |
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9831
diff
changeset
|
938 |
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9831
diff
changeset
|
939 subd = sub_read_file(filename, fps); |
18937
9e95ac641e77
Initial libass release (without mencoder support).
eugeni
parents:
18934
diff
changeset
|
940 #ifdef USE_ASS |
9e95ac641e77
Initial libass release (without mencoder support).
eugeni
parents:
18934
diff
changeset
|
941 if (ass_enabled) |
20477 | 942 #ifdef USE_ICONV |
943 asst = ass_read_file(ass_library, filename, sub_cp); | |
944 #else | |
945 asst = ass_read_file(ass_library, filename, 0); | |
946 #endif | |
19468 | 947 if (ass_enabled && subd && !asst) |
20477 | 948 asst = ass_read_subdata(ass_library, subd, fps); |
19401
c0c3a2f8bb32
Add subdata to ass_track conversion for external subtitles.
eugeni
parents:
19380
diff
changeset
|
949 |
18937
9e95ac641e77
Initial libass release (without mencoder support).
eugeni
parents:
18934
diff
changeset
|
950 if (!asst && !subd && !silent) |
9e95ac641e77
Initial libass release (without mencoder support).
eugeni
parents:
18934
diff
changeset
|
951 #else |
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9831
diff
changeset
|
952 if(!subd && !silent) |
18937
9e95ac641e77
Initial libass release (without mencoder support).
eugeni
parents:
18934
diff
changeset
|
953 #endif |
22002
ebd2d5efb11b
filename double-conversion, especially usefull for CJK users :-)
gpoirier
parents:
21930
diff
changeset
|
954 mp_msg(MSGT_CPLAYER, MSGL_ERR, MSGTR_CantLoadSub, |
ebd2d5efb11b
filename double-conversion, especially usefull for CJK users :-)
gpoirier
parents:
21930
diff
changeset
|
955 filename_recode(filename)); |
18937
9e95ac641e77
Initial libass release (without mencoder support).
eugeni
parents:
18934
diff
changeset
|
956 |
9e95ac641e77
Initial libass release (without mencoder support).
eugeni
parents:
18934
diff
changeset
|
957 #ifdef USE_ASS |
9e95ac641e77
Initial libass release (without mencoder support).
eugeni
parents:
18934
diff
changeset
|
958 if (!asst && !subd) return; |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
959 mpctx->set_of_ass_tracks[mpctx->set_of_sub_size] = asst; |
18937
9e95ac641e77
Initial libass release (without mencoder support).
eugeni
parents:
18934
diff
changeset
|
960 #else |
9e95ac641e77
Initial libass release (without mencoder support).
eugeni
parents:
18934
diff
changeset
|
961 if (!subd) return; |
9e95ac641e77
Initial libass release (without mencoder support).
eugeni
parents:
18934
diff
changeset
|
962 #endif |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
963 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
|
964 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
|
965 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
|
966 filename_recode(filename)); |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
967 ++mpctx->set_of_sub_size; |
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
968 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
|
969 filename_recode(filename)); |
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9831
diff
changeset
|
970 } |
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9831
diff
changeset
|
971 |
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
|
972 // 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
|
973 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
|
974 // 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
|
975 { |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
976 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
|
977 int i; |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
978 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
|
979 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
|
980 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
|
981 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
|
982 --mpctx->set_of_sub_size; |
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
983 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
|
984 } |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
985 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
|
986 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
|
987 } |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
988 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
|
989 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
|
990 ++mpctx->set_of_sub_size; |
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9831
diff
changeset
|
991 } |
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9831
diff
changeset
|
992 } |
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9831
diff
changeset
|
993 |
21119
5f9009952814
Move vo_spudec initialization into a separate function, for later reuse
reimar
parents:
21082
diff
changeset
|
994 void init_vo_spudec(void) { |
5f9009952814
Move vo_spudec initialization into a separate function, for later reuse
reimar
parents:
21082
diff
changeset
|
995 if (vo_spudec) |
5f9009952814
Move vo_spudec initialization into a separate function, for later reuse
reimar
parents:
21082
diff
changeset
|
996 spudec_free(vo_spudec); |
5f9009952814
Move vo_spudec initialization into a separate function, for later reuse
reimar
parents:
21082
diff
changeset
|
997 inited_flags &= ~INITED_SPUDEC; |
5f9009952814
Move vo_spudec initialization into a separate function, for later reuse
reimar
parents:
21082
diff
changeset
|
998 vo_spudec = NULL; |
5f9009952814
Move vo_spudec initialization into a separate function, for later reuse
reimar
parents:
21082
diff
changeset
|
999 if (spudec_ifo) { |
5f9009952814
Move vo_spudec initialization into a separate function, for later reuse
reimar
parents:
21082
diff
changeset
|
1000 unsigned int palette[16], width, height; |
5f9009952814
Move vo_spudec initialization into a separate function, for later reuse
reimar
parents:
21082
diff
changeset
|
1001 current_module="spudec_init_vobsub"; |
5f9009952814
Move vo_spudec initialization into a separate function, for later reuse
reimar
parents:
21082
diff
changeset
|
1002 if (vobsub_parse_ifo(NULL,spudec_ifo, palette, &width, &height, 1, -1, NULL) >= 0) |
5f9009952814
Move vo_spudec initialization into a separate function, for later reuse
reimar
parents:
21082
diff
changeset
|
1003 vo_spudec=spudec_new_scaled(palette, width, height); |
5f9009952814
Move vo_spudec initialization into a separate function, for later reuse
reimar
parents:
21082
diff
changeset
|
1004 } |
5f9009952814
Move vo_spudec initialization into a separate function, for later reuse
reimar
parents:
21082
diff
changeset
|
1005 |
5f9009952814
Move vo_spudec initialization into a separate function, for later reuse
reimar
parents:
21082
diff
changeset
|
1006 #ifdef USE_DVDREAD |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
1007 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
|
1008 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
|
1009 vo_spudec=spudec_new_scaled(((dvd_priv_t *)(mpctx->stream->priv))->cur_pgc->palette, |
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
1010 mpctx->sh_video->disp_w, mpctx->sh_video->disp_h); |
21119
5f9009952814
Move vo_spudec initialization into a separate function, for later reuse
reimar
parents:
21082
diff
changeset
|
1011 } |
5f9009952814
Move vo_spudec initialization into a separate function, for later reuse
reimar
parents:
21082
diff
changeset
|
1012 #endif |
5f9009952814
Move vo_spudec initialization into a separate function, for later reuse
reimar
parents:
21082
diff
changeset
|
1013 |
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
|
1014 #ifdef USE_DVDNAV |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
1015 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
|
1016 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
|
1017 current_module="spudec_init_dvdnav"; |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
1018 vo_spudec=spudec_new_scaled(palette, mpctx->sh_video->disp_w, mpctx->sh_video->disp_h); |
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
|
1019 } |
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
|
1020 #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
|
1021 |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
1022 if ((vo_spudec == NULL) && (mpctx->demuxer->type == DEMUXER_TYPE_MATROSKA) && |
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
1023 (mpctx->d_sub->sh != NULL) && (((sh_sub_t *)mpctx->d_sub->sh)->type == 'v')) { |
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
1024 sh_sub_t *mkv_sh_sub = (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
|
1025 current_module = "spudec_init_matroska"; |
5f9009952814
Move vo_spudec initialization into a separate function, for later reuse
reimar
parents:
21082
diff
changeset
|
1026 vo_spudec = |
5f9009952814
Move vo_spudec initialization into a separate function, for later reuse
reimar
parents:
21082
diff
changeset
|
1027 spudec_new_scaled_vobsub(mkv_sh_sub->palette, mkv_sh_sub->colors, |
5f9009952814
Move vo_spudec initialization into a separate function, for later reuse
reimar
parents:
21082
diff
changeset
|
1028 mkv_sh_sub->custom_colors, mkv_sh_sub->width, |
5f9009952814
Move vo_spudec initialization into a separate function, for later reuse
reimar
parents:
21082
diff
changeset
|
1029 mkv_sh_sub->height); |
5f9009952814
Move vo_spudec initialization into a separate function, for later reuse
reimar
parents:
21082
diff
changeset
|
1030 forced_subs_only = mkv_sh_sub->forced_subs_only; |
5f9009952814
Move vo_spudec initialization into a separate function, for later reuse
reimar
parents:
21082
diff
changeset
|
1031 } |
5f9009952814
Move vo_spudec initialization into a separate function, for later reuse
reimar
parents:
21082
diff
changeset
|
1032 |
5f9009952814
Move vo_spudec initialization into a separate function, for later reuse
reimar
parents:
21082
diff
changeset
|
1033 if (vo_spudec==NULL) { |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
1034 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
|
1035 unsigned int *palette = NULL; |
5f9009952814
Move vo_spudec initialization into a separate function, for later reuse
reimar
parents:
21082
diff
changeset
|
1036 if (sh && sh->has_palette) |
5f9009952814
Move vo_spudec initialization into a separate function, for later reuse
reimar
parents:
21082
diff
changeset
|
1037 palette = sh->palette; |
5f9009952814
Move vo_spudec initialization into a separate function, for later reuse
reimar
parents:
21082
diff
changeset
|
1038 current_module="spudec_init_normal"; |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
1039 vo_spudec=spudec_new_scaled(palette, mpctx->sh_video->disp_w, mpctx->sh_video->disp_h); |
21119
5f9009952814
Move vo_spudec initialization into a separate function, for later reuse
reimar
parents:
21082
diff
changeset
|
1040 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
|
1041 } |
5f9009952814
Move vo_spudec initialization into a separate function, for later reuse
reimar
parents:
21082
diff
changeset
|
1042 |
5f9009952814
Move vo_spudec initialization into a separate function, for later reuse
reimar
parents:
21082
diff
changeset
|
1043 if (vo_spudec!=NULL) |
5f9009952814
Move vo_spudec initialization into a separate function, for later reuse
reimar
parents:
21082
diff
changeset
|
1044 inited_flags|=INITED_SPUDEC; |
5f9009952814
Move vo_spudec initialization into a separate function, for later reuse
reimar
parents:
21082
diff
changeset
|
1045 } |
5f9009952814
Move vo_spudec initialization into a separate function, for later reuse
reimar
parents:
21082
diff
changeset
|
1046 |
7201
22beff6edf75
Improved MacOS X SDL support, enable SDL main() wrapper for Darwin, remove unused envp.
atmos4
parents:
7191
diff
changeset
|
1047 /* |
22beff6edf75
Improved MacOS X SDL support, enable SDL main() wrapper for Darwin, remove unused envp.
atmos4
parents:
7191
diff
changeset
|
1048 * In Mac OS X the SDL-lib is built upon Cocoa. The easiest way to |
22beff6edf75
Improved MacOS X SDL support, enable SDL main() wrapper for Darwin, remove unused envp.
atmos4
parents:
7191
diff
changeset
|
1049 * make it all work is to use the builtin SDL-bootstrap code, which |
22beff6edf75
Improved MacOS X SDL support, enable SDL main() wrapper for Darwin, remove unused envp.
atmos4
parents:
7191
diff
changeset
|
1050 * 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
|
1051 */ |
22beff6edf75
Improved MacOS X SDL support, enable SDL main() wrapper for Darwin, remove unused envp.
atmos4
parents:
7191
diff
changeset
|
1052 #if defined(SYS_DARWIN) && defined(HAVE_SDL) |
22beff6edf75
Improved MacOS X SDL support, enable SDL main() wrapper for Darwin, remove unused envp.
atmos4
parents:
7191
diff
changeset
|
1053 #include <SDL.h> |
22beff6edf75
Improved MacOS X SDL support, enable SDL main() wrapper for Darwin, remove unused envp.
atmos4
parents:
7191
diff
changeset
|
1054 #endif |
22beff6edf75
Improved MacOS X SDL support, enable SDL main() wrapper for Darwin, remove unused envp.
atmos4
parents:
7191
diff
changeset
|
1055 |
13710 | 1056 /** |
13857
38424a8eb0ea
reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents:
13794
diff
changeset
|
1057 * \brief append a formatted string |
38424a8eb0ea
reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents:
13794
diff
changeset
|
1058 * \param buf buffer to print into |
38424a8eb0ea
reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents:
13794
diff
changeset
|
1059 * \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
|
1060 * \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
|
1061 * \param format printf format string |
38424a8eb0ea
reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents:
13794
diff
changeset
|
1062 */ |
38424a8eb0ea
reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents:
13794
diff
changeset
|
1063 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
|
1064 { |
38424a8eb0ea
reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents:
13794
diff
changeset
|
1065 va_list va; |
38424a8eb0ea
reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents:
13794
diff
changeset
|
1066 va_start(va, format); |
38424a8eb0ea
reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents:
13794
diff
changeset
|
1067 *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
|
1068 va_end(va); |
38424a8eb0ea
reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents:
13794
diff
changeset
|
1069 if (*pos >= len ) { |
38424a8eb0ea
reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents:
13794
diff
changeset
|
1070 buf[len] = 0; |
38424a8eb0ea
reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents:
13794
diff
changeset
|
1071 *pos = len; |
38424a8eb0ea
reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents:
13794
diff
changeset
|
1072 } |
38424a8eb0ea
reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents:
13794
diff
changeset
|
1073 } |
38424a8eb0ea
reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents:
13794
diff
changeset
|
1074 |
38424a8eb0ea
reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents:
13794
diff
changeset
|
1075 /** |
16654 | 1076 * \brief append time in the hh:mm:ss.f format |
1077 * \param buf buffer to print into | |
1078 * \param pos position of terminating 0 in buf | |
1079 * \param len maximum number of characters in buf, not including terminating 0 | |
1080 * \param time time value to convert/append | |
1081 */ | |
1082 static void sadd_hhmmssf(char *buf, unsigned *pos, int len, float time) { | |
1083 long tenths = 10 * time; | |
1084 int f1 = tenths % 10; | |
1085 int ss = (tenths / 10) % 60; | |
1086 int mm = (tenths / 600) % 60; | |
1087 int hh = tenths / 36000; | |
1088 if (time <= 0) { | |
1089 saddf(buf, pos, len, "unknown"); | |
1090 return; | |
1091 } | |
1092 if (hh > 0) | |
1093 saddf(buf, pos, len, "%2d:", hh); | |
1094 if (hh > 0 || mm > 0) | |
1095 saddf(buf, pos, len, "%02d:", mm); | |
1096 saddf(buf, pos, len, "%02d.%1d", ss, f1); | |
1097 } | |
1098 | |
1099 /** | |
13857
38424a8eb0ea
reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents:
13794
diff
changeset
|
1100 * \brief print the status line |
38424a8eb0ea
reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents:
13794
diff
changeset
|
1101 * \param a_pos audio position |
38424a8eb0ea
reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents:
13794
diff
changeset
|
1102 * \param a_v A-V desynchronization |
38424a8eb0ea
reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents:
13794
diff
changeset
|
1103 * \param corr amount out A-V synchronization |
38424a8eb0ea
reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents:
13794
diff
changeset
|
1104 */ |
38424a8eb0ea
reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents:
13794
diff
changeset
|
1105 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
|
1106 { |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
1107 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
|
1108 int width; |
38424a8eb0ea
reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents:
13794
diff
changeset
|
1109 char *line; |
38424a8eb0ea
reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents:
13794
diff
changeset
|
1110 unsigned pos = 0; |
13906
db2f1e657dfe
use get_screen_size from getch2.c instead of ioctl, fixes bug #131.
reimar
parents:
13893
diff
changeset
|
1111 get_screen_size(); |
db2f1e657dfe
use get_screen_size from getch2.c instead of ioctl, fixes bug #131.
reimar
parents:
13893
diff
changeset
|
1112 if (screen_width > 0) |
db2f1e657dfe
use get_screen_size from getch2.c instead of ioctl, fixes bug #131.
reimar
parents:
13893
diff
changeset
|
1113 width = screen_width; |
13857
38424a8eb0ea
reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents:
13794
diff
changeset
|
1114 else |
38424a8eb0ea
reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents:
13794
diff
changeset
|
1115 width = 80; |
13928 | 1116 #ifdef WIN32 |
18316
b3be7df634b0
spelling/grammar/wording fixes in doxygen and non-doxygen comments
diego
parents:
18315
diff
changeset
|
1117 /* 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
|
1118 * should not depend on that). */ |
13928 | 1119 width--; |
1120 #endif | |
18316
b3be7df634b0
spelling/grammar/wording fixes in doxygen and non-doxygen comments
diego
parents:
18315
diff
changeset
|
1121 line = malloc(width + 1); // one additional char for the terminating null |
13857
38424a8eb0ea
reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents:
13794
diff
changeset
|
1122 |
38424a8eb0ea
reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents:
13794
diff
changeset
|
1123 // Audio time |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
1124 if (mpctx->sh_audio) { |
13857
38424a8eb0ea
reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents:
13794
diff
changeset
|
1125 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
|
1126 if (!sh_video) { |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
1127 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
|
1128 saddf(line, &pos, width, "("); |
16654 | 1129 sadd_hhmmssf(line, &pos, width, a_pos); |
1130 saddf(line, &pos, width, ") of %.1f (", len); | |
1131 sadd_hhmmssf(line, &pos, width, len); | |
16742 | 1132 saddf(line, &pos, width, ") "); |
13857
38424a8eb0ea
reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents:
13794
diff
changeset
|
1133 } |
38424a8eb0ea
reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents:
13794
diff
changeset
|
1134 } |
38424a8eb0ea
reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents:
13794
diff
changeset
|
1135 |
38424a8eb0ea
reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents:
13794
diff
changeset
|
1136 // Video time |
38424a8eb0ea
reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents:
13794
diff
changeset
|
1137 if (sh_video) |
38424a8eb0ea
reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents:
13794
diff
changeset
|
1138 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
|
1139 |
38424a8eb0ea
reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents:
13794
diff
changeset
|
1140 // A-V sync |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
1141 if (mpctx->sh_audio && sh_video) |
13857
38424a8eb0ea
reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents:
13794
diff
changeset
|
1142 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
|
1143 |
38424a8eb0ea
reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents:
13794
diff
changeset
|
1144 // Video stats |
38424a8eb0ea
reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents:
13794
diff
changeset
|
1145 if (sh_video) |
38424a8eb0ea
reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents:
13794
diff
changeset
|
1146 saddf(line, &pos, width, "%3d/%3d ", |
38424a8eb0ea
reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents:
13794
diff
changeset
|
1147 (int)sh_video->num_frames, |
38424a8eb0ea
reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents:
13794
diff
changeset
|
1148 (int)sh_video->num_frames_decoded); |
38424a8eb0ea
reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents:
13794
diff
changeset
|
1149 |
38424a8eb0ea
reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents:
13794
diff
changeset
|
1150 // CPU usage |
38424a8eb0ea
reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents:
13794
diff
changeset
|
1151 if (sh_video) { |
38424a8eb0ea
reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents:
13794
diff
changeset
|
1152 if (sh_video->timer > 0.5) |
38424a8eb0ea
reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents:
13794
diff
changeset
|
1153 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
|
1154 (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
|
1155 (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
|
1156 (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
|
1157 else |
38424a8eb0ea
reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents:
13794
diff
changeset
|
1158 saddf(line, &pos, width, "??%% ??%% ??,?%% "); |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
1159 } else if (mpctx->sh_audio) { |
22488 | 1160 if (mpctx->delay > 0.5) |
13857
38424a8eb0ea
reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents:
13794
diff
changeset
|
1161 saddf(line, &pos, width, "%4.1f%% ", |
22488 | 1162 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
|
1163 else |
38424a8eb0ea
reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents:
13794
diff
changeset
|
1164 saddf(line, &pos, width, "??,?%% "); |
38424a8eb0ea
reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents:
13794
diff
changeset
|
1165 } |
38424a8eb0ea
reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents:
13794
diff
changeset
|
1166 |
38424a8eb0ea
reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents:
13794
diff
changeset
|
1167 // VO stats |
38424a8eb0ea
reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents:
13794
diff
changeset
|
1168 if (sh_video) |
38424a8eb0ea
reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents:
13794
diff
changeset
|
1169 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
|
1170 |
38424a8eb0ea
reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents:
13794
diff
changeset
|
1171 #ifdef USE_STREAM_CACHE |
38424a8eb0ea
reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents:
13794
diff
changeset
|
1172 // cache stats |
38424a8eb0ea
reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents:
13794
diff
changeset
|
1173 if (stream_cache_size > 0) |
38424a8eb0ea
reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents:
13794
diff
changeset
|
1174 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
|
1175 #endif |
38424a8eb0ea
reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents:
13794
diff
changeset
|
1176 |
38424a8eb0ea
reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents:
13794
diff
changeset
|
1177 // other |
38424a8eb0ea
reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents:
13794
diff
changeset
|
1178 if (playback_speed != 1) |
38424a8eb0ea
reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents:
13794
diff
changeset
|
1179 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
|
1180 |
38424a8eb0ea
reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents:
13794
diff
changeset
|
1181 // end |
17258
3d02f6e2a432
change erase to end of line, fall back to old behavior if no termcap found
ods15
parents:
17251
diff
changeset
|
1182 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
|
1183 line[pos] = 0; |
23460 | 1184 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
|
1185 } else { |
3d02f6e2a432
change erase to end of line, fall back to old behavior if no termcap found
ods15
parents:
17251
diff
changeset
|
1186 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
|
1187 line[width] = 0; |
23460 | 1188 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
|
1189 } |
13857
38424a8eb0ea
reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents:
13794
diff
changeset
|
1190 free(line); |
38424a8eb0ea
reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents:
13794
diff
changeset
|
1191 } |
38424a8eb0ea
reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents:
13794
diff
changeset
|
1192 |
38424a8eb0ea
reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents:
13794
diff
changeset
|
1193 /** |
13710 | 1194 * \brief build a chain of audio filters that converts the input format |
1195 * to the ao's format, taking into account the current playback_speed. | |
1196 * \param sh_audio describes the requested input format of the chain. | |
1197 * \param ao_data describes the requested output format of the chain. | |
1198 */ | |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
1199 int build_afilter_chain(sh_audio_t *sh_audio, ao_data_t *ao_data) |
13710 | 1200 { |
14140
337aa26e20b5
10l, should check for != NULL before using not after...
reimar
parents:
14087
diff
changeset
|
1201 int new_srate; |
14172 | 1202 int result; |
13710 | 1203 if (!sh_audio) |
14172 | 1204 { |
14254 | 1205 #ifdef HAVE_NEW_GUI |
22285 | 1206 if (use_gui) guiGetEvent(guiSetAfilter, (char *)NULL); |
14254 | 1207 #endif |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
1208 mpctx->mixer.afilter = NULL; |
13710 | 1209 return 0; |
14172 | 1210 } |
14140
337aa26e20b5
10l, should check for != NULL before using not after...
reimar
parents:
14087
diff
changeset
|
1211 new_srate = sh_audio->samplerate * playback_speed; |
13710 | 1212 if (new_srate != ao_data->samplerate) { |
1213 // limits are taken from libaf/af_resample.c | |
1214 if (new_srate < 8000) | |
1215 new_srate = 8000; | |
1216 if (new_srate > 192000) | |
1217 new_srate = 192000; | |
1218 playback_speed = (float)new_srate / (float)sh_audio->samplerate; | |
1219 } | |
14172 | 1220 result = init_audio_filters(sh_audio, new_srate, |
14818
663c1ea5f595
finally remove the refences to bps outside libaf. also simplification of some messages and removed redundants
alex
parents:
14807
diff
changeset
|
1221 sh_audio->channels, sh_audio->sample_format, |
15811
9b4bbb6098f6
make -srate work again, unify audio filter init and preinit.
reimar
parents:
15789
diff
changeset
|
1222 &ao_data->samplerate, &ao_data->channels, &ao_data->format, |
13710 | 1223 ao_data->outburst * 4, ao_data->buffersize); |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
1224 mpctx->mixer.afilter = sh_audio->afilter; |
14254 | 1225 #ifdef HAVE_NEW_GUI |
22285 | 1226 if (use_gui) guiGetEvent(guiSetAfilter, (char *)sh_audio->afilter); |
14254 | 1227 #endif |
14172 | 1228 return result; |
13710 | 1229 } |
8800 | 1230 |
16992
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1231 |
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1232 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
|
1233 struct mp_osd_msg { |
18261 | 1234 /// Previous message on the stack. |
16992
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1235 mp_osd_msg_t* prev; |
18261 | 1236 /// Message text. |
16992
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1237 char msg[64]; |
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1238 int id,level,started; |
18261 | 1239 /// Display duration in ms. |
1240 unsigned time; | |
16992
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1241 }; |
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1242 |
18261 | 1243 /// OSD message stack. |
16992
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1244 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
|
1245 |
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1246 /** |
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1247 * \brief Add a message on the OSD message stack |
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1248 * |
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1249 * 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
|
1250 * it is pulled on top of the stack, otherwise a new message is created. |
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1251 * |
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1252 */ |
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1253 |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
1254 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
|
1255 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
|
1256 va_list va; |
17929
6fe95ee39422
Fix osd_show_msg alignment and make sure msg strings
albeu
parents:
17928
diff
changeset
|
1257 int r; |
16992
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1258 |
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1259 // 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
|
1260 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
|
1261 last = msg, msg = msg->prev); |
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1262 // not found: alloc it |
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1263 if(!msg) { |
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1264 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
|
1265 msg->prev = osd_msg_stack; |
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1266 osd_msg_stack = msg; |
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1267 } 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
|
1268 last->prev = msg->prev; |
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1269 msg->prev = osd_msg_stack; |
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1270 osd_msg_stack = msg; |
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1271 } |
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1272 // write the msg |
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1273 va_start(va,fmt); |
17929
6fe95ee39422
Fix osd_show_msg alignment and make sure msg strings
albeu
parents:
17928
diff
changeset
|
1274 r = vsnprintf(msg->msg, 64, fmt, va); |
16992
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1275 va_end(va); |
17929
6fe95ee39422
Fix osd_show_msg alignment and make sure msg strings
albeu
parents:
17928
diff
changeset
|
1276 if(r >= 64) msg->msg[63] = 0; |
16992
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1277 // set id and time |
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1278 msg->id = id; |
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1279 msg->level = level; |
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1280 msg->time = time; |
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1281 |
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1282 } |
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1283 |
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1284 /** |
17057
d301c1833d12
Add a function to remove osd msg and use it to remove the "OSD: enabled"
albeu
parents:
17021
diff
changeset
|
1285 * \brief Remove a message from the OSD stack |
d301c1833d12
Add a function to remove osd msg and use it to remove the "OSD: enabled"
albeu
parents:
17021
diff
changeset
|
1286 * |
d301c1833d12
Add a function to remove osd msg and use it to remove the "OSD: enabled"
albeu
parents:
17021
diff
changeset
|
1287 * This function can be used to get rid of a message right away. |
d301c1833d12
Add a function to remove osd msg and use it to remove the "OSD: enabled"
albeu
parents:
17021
diff
changeset
|
1288 * |
d301c1833d12
Add a function to remove osd msg and use it to remove the "OSD: enabled"
albeu
parents:
17021
diff
changeset
|
1289 */ |
d301c1833d12
Add a function to remove osd msg and use it to remove the "OSD: enabled"
albeu
parents:
17021
diff
changeset
|
1290 |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
1291 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
|
1292 mp_osd_msg_t *msg,*last=NULL; |
d301c1833d12
Add a function to remove osd msg and use it to remove the "OSD: enabled"
albeu
parents:
17021
diff
changeset
|
1293 |
d301c1833d12
Add a function to remove osd msg and use it to remove the "OSD: enabled"
albeu
parents:
17021
diff
changeset
|
1294 // 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
|
1295 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
|
1296 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
|
1297 if(!msg) return; |
d301c1833d12
Add a function to remove osd msg and use it to remove the "OSD: enabled"
albeu
parents:
17021
diff
changeset
|
1298 |
d301c1833d12
Add a function to remove osd msg and use it to remove the "OSD: enabled"
albeu
parents:
17021
diff
changeset
|
1299 // 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
|
1300 if(last) |
d301c1833d12
Add a function to remove osd msg and use it to remove the "OSD: enabled"
albeu
parents:
17021
diff
changeset
|
1301 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
|
1302 else |
d301c1833d12
Add a function to remove osd msg and use it to remove the "OSD: enabled"
albeu
parents:
17021
diff
changeset
|
1303 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
|
1304 free(msg); |
d301c1833d12
Add a function to remove osd msg and use it to remove the "OSD: enabled"
albeu
parents:
17021
diff
changeset
|
1305 } |
d301c1833d12
Add a function to remove osd msg and use it to remove the "OSD: enabled"
albeu
parents:
17021
diff
changeset
|
1306 |
d301c1833d12
Add a function to remove osd msg and use it to remove the "OSD: enabled"
albeu
parents:
17021
diff
changeset
|
1307 /** |
17938 | 1308 * \brief Remove all messages from the OSD stack |
1309 * | |
1310 */ | |
1311 | |
1312 static void clear_osd_msgs(void) { | |
1313 mp_osd_msg_t* msg = osd_msg_stack, *prev = NULL; | |
1314 while(msg) { | |
1315 prev = msg->prev; | |
1316 free(msg); | |
1317 msg = prev; | |
1318 } | |
1319 osd_msg_stack = NULL; | |
1320 } | |
1321 | |
1322 /** | |
18316
b3be7df634b0
spelling/grammar/wording fixes in doxygen and non-doxygen comments
diego
parents:
18315
diff
changeset
|
1323 * \brief Get the current message from the OSD stack. |
16992
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1324 * |
18316
b3be7df634b0
spelling/grammar/wording fixes in doxygen and non-doxygen comments
diego
parents:
18315
diff
changeset
|
1325 * 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
|
1326 * The message that should be displayed is returned (if any). |
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1327 * |
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1328 */ |
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1329 |
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1330 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
|
1331 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
|
1332 static unsigned last_update = 0; |
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1333 unsigned now = GetTimerMS(); |
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1334 unsigned diff; |
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1335 char hidden_dec_done = 0; |
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1336 |
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1337 if(!last_update) last_update = now; |
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1338 diff = now >= last_update ? now - last_update : 0; |
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1339 |
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1340 last_update = now; |
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1341 |
18316
b3be7df634b0
spelling/grammar/wording fixes in doxygen and non-doxygen comments
diego
parents:
18315
diff
changeset
|
1342 // 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
|
1343 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
|
1344 prev = msg->prev; |
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1345 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
|
1346 // 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
|
1347 // 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
|
1348 if(!msg->started || msg->time > diff) { |
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1349 if(msg->started) msg->time -= diff; |
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1350 else msg->started = 1; |
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1351 // display it |
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1352 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
|
1353 hidden_dec_done = 1; |
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1354 continue; |
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1355 } |
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1356 // kill the message |
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1357 free(msg); |
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1358 if(last) { |
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1359 last->prev = prev; |
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1360 msg = last; |
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1361 } else { |
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1362 osd_msg_stack = prev; |
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1363 msg = NULL; |
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1364 } |
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1365 } |
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1366 // Nothing found |
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1367 return NULL; |
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1368 } |
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1369 |
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1370 /** |
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1371 * \brief Display the OSD bar. |
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1372 * |
18316
b3be7df634b0
spelling/grammar/wording fixes in doxygen and non-doxygen comments
diego
parents:
18315
diff
changeset
|
1373 * 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
|
1374 * |
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1375 */ |
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1376 |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
1377 void set_osd_bar(int type,const char* name,double min,double max,double val) { |
16992
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1378 |
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1379 if(osd_level < 1) return; |
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1380 |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
1381 if(mpctx->sh_video) { |
18287
292337d09af2
Remove updating of vo_mouse_timer_const from the main loop and also
uau
parents:
18286
diff
changeset
|
1382 osd_visible = (GetTimerMS() + 1000) | 1; |
16992
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1383 vo_osd_progbar_type = type; |
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1384 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
|
1385 vo_osd_changed(OSDTYPE_PROGBAR); |
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1386 return; |
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1387 } |
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1388 |
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1389 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
|
1390 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
|
1391 } |
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1392 |
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1393 |
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1394 /** |
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1395 * \brief Update the OSD message line. |
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1396 * |
18316
b3be7df634b0
spelling/grammar/wording fixes in doxygen and non-doxygen comments
diego
parents:
18315
diff
changeset
|
1397 * 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
|
1398 * 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
|
1399 * is displayed (only on the vo OSD). |
16992
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1400 * |
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1401 */ |
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1402 |
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1403 static void update_osd_msg(void) { |
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1404 mp_osd_msg_t *msg; |
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1405 static char osd_text[64] = ""; |
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1406 static char osd_text_timer[64]; |
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1407 |
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1408 // 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
|
1409 vo_osd_text = (unsigned char*)osd_text; |
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1410 |
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1411 // Look if we have a msg |
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1412 if((msg = get_osd_msg())) { |
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1413 if(strcmp(osd_text,msg->msg)) { |
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1414 strncpy((char*)osd_text, msg->msg, 63); |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
1415 if(mpctx->sh_video) vo_osd_changed(OSDTYPE_OSD); else |
19760 | 1416 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
|
1417 } |
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1418 return; |
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1419 } |
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1420 |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
1421 if(mpctx->sh_video) { |
16992
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1422 // fallback on the timer |
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1423 if(osd_level>=2) { |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
1424 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
|
1425 int percentage = -1; |
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1426 char percentage_text[10]; |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
1427 int pts = demuxer_get_current_time(mpctx->demuxer); |
16992
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1428 |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
1429 if (mpctx->osd_show_percentage) |
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
1430 percentage = demuxer_get_percent_pos(mpctx->demuxer); |
16992
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 if (percentage >= 0) |
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1433 snprintf(percentage_text, 9, " (%d%%)", percentage); |
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1434 else |
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1435 percentage_text[0] = 0; |
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1436 |
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1437 if (osd_level == 3) |
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1438 snprintf(osd_text_timer, 63, |
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1439 "%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
|
1440 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
|
1441 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
|
1442 else |
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1443 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
|
1444 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
|
1445 pts%60,percentage_text); |
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1446 } else |
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1447 osd_text_timer[0]=0; |
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1448 |
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1449 // 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
|
1450 if(mpctx->osd_show_percentage) |
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
1451 mpctx->osd_show_percentage--; |
16992
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1452 |
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1453 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
|
1454 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
|
1455 vo_osd_changed(OSDTYPE_OSD); |
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 return; |
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1458 } |
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1459 |
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1460 // Clear the term osd line |
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1461 if(term_osd && osd_text[0]) { |
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1462 osd_text[0] = 0; |
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1463 printf("%s\n",term_osd_esc); |
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1464 } |
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1465 } |
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
1466 |
18261 | 1467 ///@} |
1468 // OSDMsgStack | |
1469 | |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
1470 |
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
1471 void reinit_audio_chain(void) { |
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
1472 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
|
1473 current_module="init_audio_codec"; |
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
|
1474 mp_msg(MSGT_CPLAYER,MSGL_INFO,"==========================================================================\n"); |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
1475 if(!init_best_audio_codec(mpctx->sh_audio,audio_codec_list,audio_fm_list)){ |
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
1476 mpctx->sh_audio=mpctx->d_audio->sh=NULL; // failed to init :( |
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
1477 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
|
1478 return; |
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
|
1479 } else |
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
|
1480 inited_flags|=INITED_ACODEC; |
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
|
1481 mp_msg(MSGT_CPLAYER,MSGL_INFO,"==========================================================================\n"); |
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
|
1482 |
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
|
1483 |
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
|
1484 //const ao_info_t *info=audio_out->info; |
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
|
1485 current_module="af_preinit"; |
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
|
1486 ao_data.samplerate=force_srate; |
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
|
1487 ao_data.channels=0; |
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
|
1488 ao_data.format=audio_output_format; |
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
|
1489 #if 1 |
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
|
1490 // first init to detect best values |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
1491 if(!preinit_audio_filters(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
|
1492 // input: |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
1493 (int)(mpctx->sh_audio->samplerate*playback_speed), |
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
1494 mpctx->sh_audio->channels, mpctx->sh_audio->sample_format, |
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
|
1495 // output: |
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
|
1496 &ao_data.samplerate, &ao_data.channels, &ao_data.format)){ |
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
|
1497 mp_msg(MSGT_CPLAYER,MSGL_ERR,MSGTR_AudioFilterChainPreinitError); |
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
|
1498 exit_player(MSGTR_Exit_error); |
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
|
1499 } |
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
|
1500 #endif |
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
|
1501 current_module="ao2_init"; |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
1502 if(!(mpctx->audio_out=init_best_audio_out(audio_driver_list, |
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
|
1503 0, // plugin flag |
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
|
1504 ao_data.samplerate, |
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
|
1505 ao_data.channels, |
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
|
1506 ao_data.format,0))){ |
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
|
1507 // FAILED: |
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
|
1508 mp_msg(MSGT_CPLAYER,MSGL_ERR,MSGTR_CannotInitAO); |
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
|
1509 uninit_player(INITED_ACODEC); // close codec |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
1510 mpctx->sh_audio=mpctx->d_audio->sh=NULL; // -> nosound |
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
1511 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
|
1512 return; |
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
|
1513 } else { |
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
|
1514 // SUCCESS: |
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
|
1515 inited_flags|=INITED_AO; |
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
|
1516 mp_msg(MSGT_CPLAYER,MSGL_INFO,"AO: [%s] %dHz %dch %s (%d bytes per sample)\n", |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
1517 mpctx->audio_out->info->short_name, |
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
|
1518 ao_data.samplerate, ao_data.channels, |
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
|
1519 af_fmt2str_short(ao_data.format), |
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
|
1520 af_fmt2bits(ao_data.format)/8 ); |
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
|
1521 mp_msg(MSGT_CPLAYER,MSGL_V,"AO: Description: %s\nAO: Author: %s\n", |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
1522 mpctx->audio_out->info->name, mpctx->audio_out->info->author); |
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
1523 if(strlen(mpctx->audio_out->info->comment) > 0) |
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
1524 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
|
1525 // 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
|
1526 #if 1 |
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
|
1527 current_module="af_init"; |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
1528 if(!build_afilter_chain(mpctx->sh_audio, &ao_data)) { |
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
|
1529 mp_msg(MSGT_CPLAYER,MSGL_ERR,MSGTR_NoMatchingFilter); |
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
|
1530 // mp_msg(MSGT_CPLAYER,MSGL_ERR,"Couldn't find matching filter / ao format! -> NOSOUND\n"); |
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
|
1531 // uninit_player(INITED_ACODEC|INITED_AO); // close codec & ao |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
1532 // sh_audio=mpctx->d_audio->sh=NULL; // -> nosound |
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
|
1533 } |
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
|
1534 #endif |
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
|
1535 } |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
1536 mpctx->mixer.audio_out = mpctx->audio_out; |
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
1537 mpctx->mixer.volstep = volstep; |
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
|
1538 } |
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
|
1539 } |
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
|
1540 |
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
|
1541 |
18261 | 1542 ///@} |
1543 // Command2Property | |
1544 | |
18710
c528c6c518f1
Clean up audio pts handling, make audio pts tracking in the audio-only
uau
parents:
18682
diff
changeset
|
1545 |
c528c6c518f1
Clean up audio pts handling, make audio pts tracking in the audio-only
uau
parents:
18682
diff
changeset
|
1546 // 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
|
1547 // ao so far. |
c528c6c518f1
Clean up audio pts handling, make audio pts tracking in the audio-only
uau
parents:
18682
diff
changeset
|
1548 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
|
1549 { |
c528c6c518f1
Clean up audio pts handling, make audio pts tracking in the audio-only
uau
parents:
18682
diff
changeset
|
1550 // 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
|
1551 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
|
1552 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
|
1553 // 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
|
1554 // 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
|
1555 // 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
|
1556 // 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
|
1557 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
|
1558 else { |
c528c6c518f1
Clean up audio pts handling, make audio pts tracking in the audio-only
uau
parents:
18682
diff
changeset
|
1559 // 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
|
1560 // 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
|
1561 // 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
|
1562 // 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
|
1563 // 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
|
1564 // 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
|
1565 // 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
|
1566 // 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
|
1567 |
c528c6c518f1
Clean up audio pts handling, make audio pts tracking in the audio-only
uau
parents:
18682
diff
changeset
|
1568 a_pts = d_audio->pts; |
19216
5fd000355777
cosmetics: fix incorrect indentation left by reimar and extra word in
uau
parents:
19209
diff
changeset
|
1569 // 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
|
1570 // 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
|
1571 // 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
|
1572 if (sh_audio->i_bps) |
19216
5fd000355777
cosmetics: fix incorrect indentation left by reimar and extra word in
uau
parents:
19209
diff
changeset
|
1573 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
|
1574 (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
|
1575 } |
c528c6c518f1
Clean up audio pts handling, make audio pts tracking in the audio-only
uau
parents:
18682
diff
changeset
|
1576 // 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
|
1577 // 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
|
1578 |
c528c6c518f1
Clean up audio pts handling, make audio pts tracking in the audio-only
uau
parents:
18682
diff
changeset
|
1579 // Decoded but not filtered |
c528c6c518f1
Clean up audio pts handling, make audio pts tracking in the audio-only
uau
parents:
18682
diff
changeset
|
1580 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
|
1581 |
c528c6c518f1
Clean up audio pts handling, make audio pts tracking in the audio-only
uau
parents:
18682
diff
changeset
|
1582 // 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
|
1583 // accept everything to internal buffers yet |
c528c6c518f1
Clean up audio pts handling, make audio pts tracking in the audio-only
uau
parents:
18682
diff
changeset
|
1584 a_pts -= sh_audio->a_out_buffer_len * playback_speed / (double)ao_data.bps; |
c528c6c518f1
Clean up audio pts handling, make audio pts tracking in the audio-only
uau
parents:
18682
diff
changeset
|
1585 |
c528c6c518f1
Clean up audio pts handling, make audio pts tracking in the audio-only
uau
parents:
18682
diff
changeset
|
1586 return a_pts; |
c528c6c518f1
Clean up audio pts handling, make audio pts tracking in the audio-only
uau
parents:
18682
diff
changeset
|
1587 } |
c528c6c518f1
Clean up audio pts handling, make audio pts tracking in the audio-only
uau
parents:
18682
diff
changeset
|
1588 |
c528c6c518f1
Clean up audio pts handling, make audio pts tracking in the audio-only
uau
parents:
18682
diff
changeset
|
1589 // 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
|
1590 double playing_audio_pts(sh_audio_t *sh_audio, demux_stream_t *d_audio, |
18710
c528c6c518f1
Clean up audio pts handling, make audio pts tracking in the audio-only
uau
parents:
18682
diff
changeset
|
1591 ao_functions_t *audio_out) |
c528c6c518f1
Clean up audio pts handling, make audio pts tracking in the audio-only
uau
parents:
18682
diff
changeset
|
1592 { |
c528c6c518f1
Clean up audio pts handling, make audio pts tracking in the audio-only
uau
parents:
18682
diff
changeset
|
1593 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
|
1594 audio_out->get_delay(); |
c528c6c518f1
Clean up audio pts handling, make audio pts tracking in the audio-only
uau
parents:
18682
diff
changeset
|
1595 } |
c528c6c518f1
Clean up audio pts handling, make audio pts tracking in the audio-only
uau
parents:
18682
diff
changeset
|
1596 |
18917
d9a75b26da6c
Add a new video pts tracking mode, enabled by option -correct-pts.
uau
parents:
18913
diff
changeset
|
1597 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
|
1598 { |
d9a75b26da6c
Add a new video pts tracking mode, enabled by option -correct-pts.
uau
parents:
18913
diff
changeset
|
1599 unsigned char *start; |
d9a75b26da6c
Add a new video pts tracking mode, enabled by option -correct-pts.
uau
parents:
18913
diff
changeset
|
1600 int in_size; |
d9a75b26da6c
Add a new video pts tracking mode, enabled by option -correct-pts.
uau
parents:
18913
diff
changeset
|
1601 int hit_eof=0; |
d9a75b26da6c
Add a new video pts tracking mode, enabled by option -correct-pts.
uau
parents:
18913
diff
changeset
|
1602 double pts; |
d9a75b26da6c
Add a new video pts tracking mode, enabled by option -correct-pts.
uau
parents:
18913
diff
changeset
|
1603 |
d9a75b26da6c
Add a new video pts tracking mode, enabled by option -correct-pts.
uau
parents:
18913
diff
changeset
|
1604 while (1) { |
20904 | 1605 void *decoded_frame; |
18917
d9a75b26da6c
Add a new video pts tracking mode, enabled by option -correct-pts.
uau
parents:
18913
diff
changeset
|
1606 current_module = "decode video"; |
d9a75b26da6c
Add a new video pts tracking mode, enabled by option -correct-pts.
uau
parents:
18913
diff
changeset
|
1607 // 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
|
1608 // 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
|
1609 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
|
1610 break; |
d9a75b26da6c
Add a new video pts tracking mode, enabled by option -correct-pts.
uau
parents:
18913
diff
changeset
|
1611 current_module = "video_read_frame"; |
d9a75b26da6c
Add a new video pts tracking mode, enabled by option -correct-pts.
uau
parents:
18913
diff
changeset
|
1612 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
|
1613 if (in_size < 0) { |
d9a75b26da6c
Add a new video pts tracking mode, enabled by option -correct-pts.
uau
parents:
18913
diff
changeset
|
1614 // 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
|
1615 in_size = 0; |
d9a75b26da6c
Add a new video pts tracking mode, enabled by option -correct-pts.
uau
parents:
18913
diff
changeset
|
1616 pts = 1e300; |
d9a75b26da6c
Add a new video pts tracking mode, enabled by option -correct-pts.
uau
parents:
18913
diff
changeset
|
1617 hit_eof = 1; |
d9a75b26da6c
Add a new video pts tracking mode, enabled by option -correct-pts.
uau
parents:
18913
diff
changeset
|
1618 } |
d9a75b26da6c
Add a new video pts tracking mode, enabled by option -correct-pts.
uau
parents:
18913
diff
changeset
|
1619 if (in_size > max_framesize) |
d9a75b26da6c
Add a new video pts tracking mode, enabled by option -correct-pts.
uau
parents:
18913
diff
changeset
|
1620 max_framesize = in_size; |
20902
bfb6eacd9c4a
Update OSD contents only after the correct values for the frame are known.
uau
parents:
20900
diff
changeset
|
1621 current_module = "decode video"; |
20904 | 1622 decoded_frame = decode_video(sh_video, start, in_size, 0, pts); |
20902
bfb6eacd9c4a
Update OSD contents only after the correct values for the frame are known.
uau
parents:
20900
diff
changeset
|
1623 if (decoded_frame) { |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
1624 update_subtitles(sh_video, mpctx->d_sub, 0); |
20902
bfb6eacd9c4a
Update OSD contents only after the correct values for the frame are known.
uau
parents:
20900
diff
changeset
|
1625 update_osd_msg(); |
21055
bc2cf8eb55b3
Move subtitle updating to a separate function, fix inverted condition
uau
parents:
21042
diff
changeset
|
1626 current_module = "filter video"; |
20902
bfb6eacd9c4a
Update OSD contents only after the correct values for the frame are known.
uau
parents:
20900
diff
changeset
|
1627 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
|
1628 break; |
bfb6eacd9c4a
Update OSD contents only after the correct values for the frame are known.
uau
parents:
20900
diff
changeset
|
1629 } |
18917
d9a75b26da6c
Add a new video pts tracking mode, enabled by option -correct-pts.
uau
parents:
18913
diff
changeset
|
1630 if (hit_eof) |
d9a75b26da6c
Add a new video pts tracking mode, enabled by option -correct-pts.
uau
parents:
18913
diff
changeset
|
1631 return 0; |
d9a75b26da6c
Add a new video pts tracking mode, enabled by option -correct-pts.
uau
parents:
18913
diff
changeset
|
1632 } |
d9a75b26da6c
Add a new video pts tracking mode, enabled by option -correct-pts.
uau
parents:
18913
diff
changeset
|
1633 return 1; |
d9a75b26da6c
Add a new video pts tracking mode, enabled by option -correct-pts.
uau
parents:
18913
diff
changeset
|
1634 } |
d9a75b26da6c
Add a new video pts tracking mode, enabled by option -correct-pts.
uau
parents:
18913
diff
changeset
|
1635 |
20887 | 1636 #ifdef HAVE_RTC |
1637 int rtc_fd = -1; | |
1638 #endif | |
1639 | |
1640 static float timing_sleep(float time_frame) | |
1641 { | |
1642 #ifdef HAVE_RTC | |
1643 if (rtc_fd >= 0){ | |
1644 // -------- RTC ----------- | |
1645 current_module="sleep_rtc"; | |
1646 while (time_frame > 0.000) { | |
1647 unsigned long rtc_ts; | |
1648 if (read(rtc_fd, &rtc_ts, sizeof(rtc_ts)) <= 0) | |
1649 mp_msg(MSGT_CPLAYER, MSGL_ERR, MSGTR_LinuxRTCReadError, strerror(errno)); | |
1650 time_frame -= GetRelativeTime(); | |
1651 } | |
1652 } else | |
1653 #endif | |
1654 #ifdef SYS_DARWIN | |
1655 { | |
1656 current_module = "sleep_darwin"; | |
1657 while (time_frame > 0.005) { | |
1658 usec_sleep(1000000*time_frame); | |
1659 time_frame -= GetRelativeTime(); | |
1660 } | |
1661 } | |
1662 #else | |
1663 { | |
1664 // assume kernel HZ=100 for softsleep, works with larger HZ but with | |
1665 // unnecessarily high CPU usage | |
1666 float margin = softsleep ? 0.011 : 0; | |
1667 current_module = "sleep_timer"; | |
1668 while (time_frame > margin) { | |
1669 usec_sleep(1000000 * (time_frame - margin)); | |
1670 time_frame -= GetRelativeTime(); | |
1671 } | |
1672 if (softsleep){ | |
1673 current_module = "sleep_soft"; | |
1674 if (time_frame < 0) | |
1675 mp_msg(MSGT_AVSYNC, MSGL_WARN, MSGTR_SoftsleepUnderflow); | |
1676 while (time_frame > 0) | |
1677 time_frame-=GetRelativeTime(); // burn the CPU | |
1678 } | |
1679 } | |
1680 #endif /* SYS_DARWIN */ | |
1681 return time_frame; | |
1682 } | |
1683 | |
1684 static void adjust_sync_and_print_status(int between_frames, float timing_error) | |
1685 { | |
1686 current_module="av_sync"; | |
1687 | |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
1688 if(mpctx->sh_audio){ |
20887 | 1689 double a_pts, v_pts; |
1690 | |
1691 if (autosync) | |
1692 /* | |
1693 * If autosync is enabled, the value for delay must be calculated | |
1694 * a bit differently. It is set only to the difference between | |
1695 * the audio and video timers. Any attempt to include the real | |
1696 * or corrected delay causes the pts_correction code below to | |
1697 * try to correct for the changes in delay which autosync is | |
1698 * trying to measure. This keeps the two from competing, but still | |
1699 * allows the code to correct for PTS drift *only*. (Using a delay | |
1700 * value here, even a "corrected" one, would be incompatible with | |
1701 * autosync mode.) | |
1702 */ | |
22488 | 1703 a_pts = written_audio_pts(mpctx->sh_audio, mpctx->d_audio) - mpctx->delay; |
20887 | 1704 else |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
1705 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
|
1706 |
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
1707 v_pts = mpctx->sh_video->pts; |
20887 | 1708 |
1709 { | |
1710 static int drop_message=0; | |
1711 double AV_delay = a_pts - audio_delay - v_pts; | |
1712 double x; | |
1713 if (AV_delay>0.5 && drop_frame_cnt>50 && drop_message==0){ | |
1714 ++drop_message; | |
1715 mp_msg(MSGT_AVSYNC,MSGL_WARN,MSGTR_SystemTooSlow); | |
1716 } | |
1717 if (autosync) | |
1718 x = AV_delay*0.1f; | |
1719 else | |
1720 /* Do not correct target time for the next frame if this frame | |
1721 * was late not because of wrong target time but because the | |
1722 * target time could not be met */ | |
1723 x = (AV_delay + timing_error * playback_speed) * 0.1f; | |
1724 if (x < -max_pts_correction) | |
1725 x = -max_pts_correction; | |
1726 else if (x> max_pts_correction) | |
1727 x = max_pts_correction; | |
1728 if (default_max_pts_correction >= 0) | |
1729 max_pts_correction = default_max_pts_correction; | |
1730 else | |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
1731 max_pts_correction = mpctx->sh_video->frametime*0.10; // +-10% of time |
20887 | 1732 if (!between_frames) { |
22488 | 1733 mpctx->delay+=x; |
20887 | 1734 c_total+=x; |
1735 } | |
1736 if(!quiet) | |
1737 print_status(a_pts - audio_delay, AV_delay, c_total); | |
1738 } | |
1739 | |
1740 } else { | |
1741 // No audio: | |
1742 | |
1743 if (!quiet) | |
1744 print_status(0, 0, 0); | |
1745 } | |
1746 } | |
1747 | |
20986 | 1748 static int fill_audio_out_buffers(void) |
20889
35f37142f3b8
Move audio playing code from main() into a separate function.
uau
parents:
20888
diff
changeset
|
1749 { |
35f37142f3b8
Move audio playing code from main() into a separate function.
uau
parents:
20888
diff
changeset
|
1750 unsigned int t; |
35f37142f3b8
Move audio playing code from main() into a separate function.
uau
parents:
20888
diff
changeset
|
1751 double tt; |
35f37142f3b8
Move audio playing code from main() into a separate function.
uau
parents:
20888
diff
changeset
|
1752 int playsize; |
35f37142f3b8
Move audio playing code from main() into a separate function.
uau
parents:
20888
diff
changeset
|
1753 int playflags=0; |
35f37142f3b8
Move audio playing code from main() into a separate function.
uau
parents:
20888
diff
changeset
|
1754 int audio_eof=0; |
20890
9e2d69c27ddb
Try filling audio buffers more if they're very large, add some comments.
uau
parents:
20889
diff
changeset
|
1755 int bytes_to_write; |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
1756 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
|
1757 |
35f37142f3b8
Move audio playing code from main() into a separate function.
uau
parents:
20888
diff
changeset
|
1758 current_module="play_audio"; |
35f37142f3b8
Move audio playing code from main() into a separate function.
uau
parents:
20888
diff
changeset
|
1759 |
35f37142f3b8
Move audio playing code from main() into a separate function.
uau
parents:
20888
diff
changeset
|
1760 while (1) { |
20890
9e2d69c27ddb
Try filling audio buffers more if they're very large, add some comments.
uau
parents:
20889
diff
changeset
|
1761 // 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
|
1762 // 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
|
1763 // in get_space() |
22488 | 1764 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
|
1765 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
|
1766 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
|
1767 break; |
20889
35f37142f3b8
Move audio playing code from main() into a separate function.
uau
parents:
20888
diff
changeset
|
1768 |
35f37142f3b8
Move audio playing code from main() into a separate function.
uau
parents:
20888
diff
changeset
|
1769 // handle audio-only case: |
20890
9e2d69c27ddb
Try filling audio buffers more if they're very large, add some comments.
uau
parents:
20889
diff
changeset
|
1770 // 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
|
1771 // to avoid 100% CPU use |
9e2d69c27ddb
Try filling audio buffers more if they're very large, add some comments.
uau
parents:
20889
diff
changeset
|
1772 usec_sleep(10000); // Wait a tick before retry |
9e2d69c27ddb
Try filling audio buffers more if they're very large, add some comments.
uau
parents:
20889
diff
changeset
|
1773 } |
9e2d69c27ddb
Try filling audio buffers more if they're very large, add some comments.
uau
parents:
20889
diff
changeset
|
1774 |
9e2d69c27ddb
Try filling audio buffers more if they're very large, add some comments.
uau
parents:
20889
diff
changeset
|
1775 while (bytes_to_write) { |
9e2d69c27ddb
Try filling audio buffers more if they're very large, add some comments.
uau
parents:
20889
diff
changeset
|
1776 playsize = bytes_to_write; |
20889
35f37142f3b8
Move audio playing code from main() into a separate function.
uau
parents:
20888
diff
changeset
|
1777 if (playsize > MAX_OUTBURST) |
35f37142f3b8
Move audio playing code from main() into a separate function.
uau
parents:
20888
diff
changeset
|
1778 playsize = MAX_OUTBURST; |
20890
9e2d69c27ddb
Try filling audio buffers more if they're very large, add some comments.
uau
parents:
20889
diff
changeset
|
1779 bytes_to_write -= playsize; |
20889
35f37142f3b8
Move audio playing code from main() into a separate function.
uau
parents:
20888
diff
changeset
|
1780 |
35f37142f3b8
Move audio playing code from main() into a separate function.
uau
parents:
20888
diff
changeset
|
1781 // Fill buffer if needed: |
35f37142f3b8
Move audio playing code from main() into a separate function.
uau
parents:
20888
diff
changeset
|
1782 current_module="decode_audio"; |
35f37142f3b8
Move audio playing code from main() into a separate function.
uau
parents:
20888
diff
changeset
|
1783 t = GetTimer(); |
35f37142f3b8
Move audio playing code from main() into a separate function.
uau
parents:
20888
diff
changeset
|
1784 while (sh_audio->a_out_buffer_len < playsize) { |
35f37142f3b8
Move audio playing code from main() into a separate function.
uau
parents:
20888
diff
changeset
|
1785 int buflen = sh_audio->a_out_buffer_len; |
35f37142f3b8
Move audio playing code from main() into a separate function.
uau
parents:
20888
diff
changeset
|
1786 int ret = decode_audio(sh_audio, &sh_audio->a_out_buffer[buflen], |
35f37142f3b8
Move audio playing code from main() into a separate function.
uau
parents:
20888
diff
changeset
|
1787 playsize - buflen, // min bytes |
35f37142f3b8
Move audio playing code from main() into a separate function.
uau
parents:
20888
diff
changeset
|
1788 sh_audio->a_out_buffer_size - buflen // max |
35f37142f3b8
Move audio playing code from main() into a separate function.
uau
parents:
20888
diff
changeset
|
1789 ); |
35f37142f3b8
Move audio playing code from main() into a separate function.
uau
parents:
20888
diff
changeset
|
1790 if (ret <= 0) { // EOF? |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
1791 if (mpctx->d_audio->eof) { |
20889
35f37142f3b8
Move audio playing code from main() into a separate function.
uau
parents:
20888
diff
changeset
|
1792 audio_eof = 1; |
35f37142f3b8
Move audio playing code from main() into a separate function.
uau
parents:
20888
diff
changeset
|
1793 if (sh_audio->a_out_buffer_len == 0) |
35f37142f3b8
Move audio playing code from main() into a separate function.
uau
parents:
20888
diff
changeset
|
1794 return 0; |
35f37142f3b8
Move audio playing code from main() into a separate function.
uau
parents:
20888
diff
changeset
|
1795 } |
35f37142f3b8
Move audio playing code from main() into a separate function.
uau
parents:
20888
diff
changeset
|
1796 break; |
35f37142f3b8
Move audio playing code from main() into a separate function.
uau
parents:
20888
diff
changeset
|
1797 } |
35f37142f3b8
Move audio playing code from main() into a separate function.
uau
parents:
20888
diff
changeset
|
1798 sh_audio->a_out_buffer_len += ret; |
35f37142f3b8
Move audio playing code from main() into a separate function.
uau
parents:
20888
diff
changeset
|
1799 } |
35f37142f3b8
Move audio playing code from main() into a separate function.
uau
parents:
20888
diff
changeset
|
1800 t = GetTimer() - t; |
35f37142f3b8
Move audio playing code from main() into a separate function.
uau
parents:
20888
diff
changeset
|
1801 tt = t*0.000001f; audio_time_usage+=tt; |
35f37142f3b8
Move audio playing code from main() into a separate function.
uau
parents:
20888
diff
changeset
|
1802 if (playsize > sh_audio->a_out_buffer_len) { |
35f37142f3b8
Move audio playing code from main() into a separate function.
uau
parents:
20888
diff
changeset
|
1803 playsize = sh_audio->a_out_buffer_len; |
35f37142f3b8
Move audio playing code from main() into a separate function.
uau
parents:
20888
diff
changeset
|
1804 if (audio_eof) |
35f37142f3b8
Move audio playing code from main() into a separate function.
uau
parents:
20888
diff
changeset
|
1805 playflags |= AOPLAY_FINAL_CHUNK; |
35f37142f3b8
Move audio playing code from main() into a separate function.
uau
parents:
20888
diff
changeset
|
1806 } |
35f37142f3b8
Move audio playing code from main() into a separate function.
uau
parents:
20888
diff
changeset
|
1807 if (!playsize) |
35f37142f3b8
Move audio playing code from main() into a separate function.
uau
parents:
20888
diff
changeset
|
1808 break; |
35f37142f3b8
Move audio playing code from main() into a separate function.
uau
parents:
20888
diff
changeset
|
1809 |
35f37142f3b8
Move audio playing code from main() into a separate function.
uau
parents:
20888
diff
changeset
|
1810 // play audio: |
35f37142f3b8
Move audio playing code from main() into a separate function.
uau
parents:
20888
diff
changeset
|
1811 current_module="play_audio"; |
20890
9e2d69c27ddb
Try filling audio buffers more if they're very large, add some comments.
uau
parents:
20889
diff
changeset
|
1812 |
9e2d69c27ddb
Try filling audio buffers more if they're very large, add some comments.
uau
parents:
20889
diff
changeset
|
1813 // 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
|
1814 // 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
|
1815 // would not having access to this make them more broken? |
22488 | 1816 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
|
1817 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
|
1818 |
35f37142f3b8
Move audio playing code from main() into a separate function.
uau
parents:
20888
diff
changeset
|
1819 if (playsize > 0) { |
35f37142f3b8
Move audio playing code from main() into a separate function.
uau
parents:
20888
diff
changeset
|
1820 sh_audio->a_out_buffer_len -= playsize; |
35f37142f3b8
Move audio playing code from main() into a separate function.
uau
parents:
20888
diff
changeset
|
1821 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
|
1822 sh_audio->a_out_buffer_len); |
22488 | 1823 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
|
1824 } |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
1825 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
|
1826 // 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
|
1827 // 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
|
1828 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
|
1829 sh_audio->a_out_buffer_len = 0; |
35f37142f3b8
Move audio playing code from main() into a separate function.
uau
parents:
20888
diff
changeset
|
1830 } |
35f37142f3b8
Move audio playing code from main() into a separate function.
uau
parents:
20888
diff
changeset
|
1831 } |
35f37142f3b8
Move audio playing code from main() into a separate function.
uau
parents:
20888
diff
changeset
|
1832 return 1; |
35f37142f3b8
Move audio playing code from main() into a separate function.
uau
parents:
20888
diff
changeset
|
1833 } |
20887 | 1834 |
20986 | 1835 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
|
1836 { |
20904 | 1837 int frame_time_remaining = 0; |
20899
c00d8c1aa0ab
Replace sleep time calculation in main() with a separate function.
uau
parents:
20898
diff
changeset
|
1838 current_module="calc_sleep_time"; |
c00d8c1aa0ab
Replace sleep time calculation in main() with a separate function.
uau
parents:
20898
diff
changeset
|
1839 |
c00d8c1aa0ab
Replace sleep time calculation in main() with a separate function.
uau
parents:
20898
diff
changeset
|
1840 *time_frame -= GetRelativeTime(); // reset timer |
c00d8c1aa0ab
Replace sleep time calculation in main() with a separate function.
uau
parents:
20898
diff
changeset
|
1841 |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
1842 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
|
1843 float delay = mpctx->audio_out->get_delay(); |
20899
c00d8c1aa0ab
Replace sleep time calculation in main() with a separate function.
uau
parents:
20898
diff
changeset
|
1844 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
|
1845 |
c00d8c1aa0ab
Replace sleep time calculation in main() with a separate function.
uau
parents:
20898
diff
changeset
|
1846 if (autosync) { |
c00d8c1aa0ab
Replace sleep time calculation in main() with a separate function.
uau
parents:
20898
diff
changeset
|
1847 /* |
c00d8c1aa0ab
Replace sleep time calculation in main() with a separate function.
uau
parents:
20898
diff
changeset
|
1848 * 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
|
1849 * 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
|
1850 * 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
|
1851 * 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
|
1852 * 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
|
1853 * 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
|
1854 * 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
|
1855 */ |
22488 | 1856 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
|
1857 float difference = delay - predicted; |
c00d8c1aa0ab
Replace sleep time calculation in main() with a separate function.
uau
parents:
20898
diff
changeset
|
1858 delay = predicted + difference / (float)autosync; |
c00d8c1aa0ab
Replace sleep time calculation in main() with a separate function.
uau
parents:
20898
diff
changeset
|
1859 } |
c00d8c1aa0ab
Replace sleep time calculation in main() with a separate function.
uau
parents:
20898
diff
changeset
|
1860 |
22488 | 1861 *time_frame = delay - mpctx->delay / playback_speed; |
20899
c00d8c1aa0ab
Replace sleep time calculation in main() with a separate function.
uau
parents:
20898
diff
changeset
|
1862 |
c00d8c1aa0ab
Replace sleep time calculation in main() with a separate function.
uau
parents:
20898
diff
changeset
|
1863 // delay = amount of audio buffered in soundcard/driver |
c00d8c1aa0ab
Replace sleep time calculation in main() with a separate function.
uau
parents:
20898
diff
changeset
|
1864 if (delay > 0.25) delay=0.25; else |
c00d8c1aa0ab
Replace sleep time calculation in main() with a separate function.
uau
parents:
20898
diff
changeset
|
1865 if (delay < 0.10) delay=0.10; |
c00d8c1aa0ab
Replace sleep time calculation in main() with a separate function.
uau
parents:
20898
diff
changeset
|
1866 if (*time_frame > delay*0.6) { |
c00d8c1aa0ab
Replace sleep time calculation in main() with a separate function.
uau
parents:
20898
diff
changeset
|
1867 // 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
|
1868 frame_time_remaining = 1; |
c00d8c1aa0ab
Replace sleep time calculation in main() with a separate function.
uau
parents:
20898
diff
changeset
|
1869 *time_frame = delay*0.5; |
c00d8c1aa0ab
Replace sleep time calculation in main() with a separate function.
uau
parents:
20898
diff
changeset
|
1870 } |
c00d8c1aa0ab
Replace sleep time calculation in main() with a separate function.
uau
parents:
20898
diff
changeset
|
1871 } else { |
c00d8c1aa0ab
Replace sleep time calculation in main() with a separate function.
uau
parents:
20898
diff
changeset
|
1872 // 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
|
1873 // don't try to "catch up". |
c00d8c1aa0ab
Replace sleep time calculation in main() with a separate function.
uau
parents:
20898
diff
changeset
|
1874 // 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
|
1875 // without sleeping. |
c00d8c1aa0ab
Replace sleep time calculation in main() with a separate function.
uau
parents:
20898
diff
changeset
|
1876 if (*time_frame < -0.2 || benchmark) |
c00d8c1aa0ab
Replace sleep time calculation in main() with a separate function.
uau
parents:
20898
diff
changeset
|
1877 *time_frame = 0; |
c00d8c1aa0ab
Replace sleep time calculation in main() with a separate function.
uau
parents:
20898
diff
changeset
|
1878 } |
c00d8c1aa0ab
Replace sleep time calculation in main() with a separate function.
uau
parents:
20898
diff
changeset
|
1879 |
c00d8c1aa0ab
Replace sleep time calculation in main() with a separate function.
uau
parents:
20898
diff
changeset
|
1880 *aq_sleep_time += *time_frame; |
c00d8c1aa0ab
Replace sleep time calculation in main() with a separate function.
uau
parents:
20898
diff
changeset
|
1881 |
c00d8c1aa0ab
Replace sleep time calculation in main() with a separate function.
uau
parents:
20898
diff
changeset
|
1882 |
c00d8c1aa0ab
Replace sleep time calculation in main() with a separate function.
uau
parents:
20898
diff
changeset
|
1883 //============================== SLEEP: =================================== |
c00d8c1aa0ab
Replace sleep time calculation in main() with a separate function.
uau
parents:
20898
diff
changeset
|
1884 |
c00d8c1aa0ab
Replace sleep time calculation in main() with a separate function.
uau
parents:
20898
diff
changeset
|
1885 // 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
|
1886 if (*time_frame > 0.001 && !(vo_flags&256)) |
c00d8c1aa0ab
Replace sleep time calculation in main() with a separate function.
uau
parents:
20898
diff
changeset
|
1887 *time_frame = timing_sleep(*time_frame); |
c00d8c1aa0ab
Replace sleep time calculation in main() with a separate function.
uau
parents:
20898
diff
changeset
|
1888 return frame_time_remaining; |
c00d8c1aa0ab
Replace sleep time calculation in main() with a separate function.
uau
parents:
20898
diff
changeset
|
1889 } |
c00d8c1aa0ab
Replace sleep time calculation in main() with a separate function.
uau
parents:
20898
diff
changeset
|
1890 |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
1891 int reinit_video_chain(void) { |
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
1892 sh_video_t * const sh_video = mpctx->sh_video; |
20947
6baefa24946f
moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents:
20915
diff
changeset
|
1893 //================== Init VIDEO (codec & libvo) ========================== |
6baefa24946f
moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents:
20915
diff
changeset
|
1894 if(!fixed_vo || !(inited_flags&INITED_VO)){ |
6baefa24946f
moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents:
20915
diff
changeset
|
1895 current_module="preinit_libvo"; |
6baefa24946f
moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents:
20915
diff
changeset
|
1896 |
6baefa24946f
moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents:
20915
diff
changeset
|
1897 //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
|
1898 vo_config_count=0; |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
1899 //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
|
1900 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
|
1901 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
|
1902 goto err_out; |
20947
6baefa24946f
moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents:
20915
diff
changeset
|
1903 } |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
1904 sh_video->video_out=mpctx->video_out; |
20947
6baefa24946f
moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents:
20915
diff
changeset
|
1905 inited_flags|=INITED_VO; |
6baefa24946f
moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents:
20915
diff
changeset
|
1906 } |
6baefa24946f
moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents:
20915
diff
changeset
|
1907 |
6baefa24946f
moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents:
20915
diff
changeset
|
1908 current_module="init_video_filters"; |
6baefa24946f
moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents:
20915
diff
changeset
|
1909 { |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
1910 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
|
1911 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
|
1912 } |
6baefa24946f
moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents:
20915
diff
changeset
|
1913 #ifdef HAVE_MENU |
6baefa24946f
moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents:
20915
diff
changeset
|
1914 if(use_menu) { |
6baefa24946f
moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents:
20915
diff
changeset
|
1915 char* vf_arg[] = { "_oldargs_", menu_root, NULL }; |
6baefa24946f
moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents:
20915
diff
changeset
|
1916 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
|
1917 if(!vf_menu) { |
6baefa24946f
moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents:
20915
diff
changeset
|
1918 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
|
1919 use_menu = 0; |
6baefa24946f
moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents:
20915
diff
changeset
|
1920 } |
6baefa24946f
moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents:
20915
diff
changeset
|
1921 } |
6baefa24946f
moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents:
20915
diff
changeset
|
1922 if(vf_menu) |
6baefa24946f
moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents:
20915
diff
changeset
|
1923 sh_video->vfilter=(void*)vf_menu; |
6baefa24946f
moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents:
20915
diff
changeset
|
1924 #endif |
6baefa24946f
moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents:
20915
diff
changeset
|
1925 |
6baefa24946f
moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents:
20915
diff
changeset
|
1926 #ifdef USE_ASS |
6baefa24946f
moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents:
20915
diff
changeset
|
1927 if(ass_enabled) { |
6baefa24946f
moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents:
20915
diff
changeset
|
1928 int i; |
6baefa24946f
moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents:
20915
diff
changeset
|
1929 int insert = 1; |
6baefa24946f
moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents:
20915
diff
changeset
|
1930 if (vf_settings) |
6baefa24946f
moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents:
20915
diff
changeset
|
1931 for (i = 0; vf_settings[i].name; ++i) |
6baefa24946f
moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents:
20915
diff
changeset
|
1932 if (strcmp(vf_settings[i].name, "ass") == 0) { |
6baefa24946f
moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents:
20915
diff
changeset
|
1933 insert = 0; |
6baefa24946f
moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents:
20915
diff
changeset
|
1934 break; |
6baefa24946f
moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents:
20915
diff
changeset
|
1935 } |
6baefa24946f
moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents:
20915
diff
changeset
|
1936 if (insert) { |
6baefa24946f
moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents:
20915
diff
changeset
|
1937 extern vf_info_t vf_info_ass; |
6baefa24946f
moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents:
20915
diff
changeset
|
1938 vf_info_t* libass_vfs[] = {&vf_info_ass, NULL}; |
6baefa24946f
moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents:
20915
diff
changeset
|
1939 char* vf_arg[] = {"auto", "1", NULL}; |
6baefa24946f
moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents:
20915
diff
changeset
|
1940 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
|
1941 if (vf_ass) |
6baefa24946f
moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents:
20915
diff
changeset
|
1942 sh_video->vfilter=(void*)vf_ass; |
6baefa24946f
moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents:
20915
diff
changeset
|
1943 else |
6baefa24946f
moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents:
20915
diff
changeset
|
1944 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
|
1945 } |
6baefa24946f
moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents:
20915
diff
changeset
|
1946 } |
6baefa24946f
moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents:
20915
diff
changeset
|
1947 #endif |
6baefa24946f
moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents:
20915
diff
changeset
|
1948 |
6baefa24946f
moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents:
20915
diff
changeset
|
1949 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
|
1950 |
6baefa24946f
moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents:
20915
diff
changeset
|
1951 #ifdef USE_ASS |
6baefa24946f
moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents:
20915
diff
changeset
|
1952 if (ass_enabled) |
6baefa24946f
moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents:
20915
diff
changeset
|
1953 ((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
|
1954 #endif |
6baefa24946f
moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents:
20915
diff
changeset
|
1955 |
6baefa24946f
moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents:
20915
diff
changeset
|
1956 current_module="init_video_codec"; |
6baefa24946f
moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents:
20915
diff
changeset
|
1957 |
6baefa24946f
moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents:
20915
diff
changeset
|
1958 mp_msg(MSGT_CPLAYER,MSGL_INFO,"==========================================================================\n"); |
6baefa24946f
moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents:
20915
diff
changeset
|
1959 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
|
1960 mp_msg(MSGT_CPLAYER,MSGL_INFO,"==========================================================================\n"); |
6baefa24946f
moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents:
20915
diff
changeset
|
1961 |
6baefa24946f
moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents:
20915
diff
changeset
|
1962 if(!sh_video->inited){ |
6baefa24946f
moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents:
20915
diff
changeset
|
1963 if(!fixed_vo) uninit_player(INITED_VO); |
21031
e45bb0ee5558
Make sure sh_video == NULL when reinit_video_chain fails.
reimar
parents:
21030
diff
changeset
|
1964 goto err_out; |
20947
6baefa24946f
moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents:
20915
diff
changeset
|
1965 } |
6baefa24946f
moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents:
20915
diff
changeset
|
1966 |
6baefa24946f
moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents:
20915
diff
changeset
|
1967 inited_flags|=INITED_VCODEC; |
6baefa24946f
moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents:
20915
diff
changeset
|
1968 |
6baefa24946f
moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents:
20915
diff
changeset
|
1969 if (sh_video->codec) |
6baefa24946f
moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents:
20915
diff
changeset
|
1970 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
|
1971 |
21077 | 1972 sh_video->last_pts = MP_NOPTS_VALUE; |
1973 sh_video->num_buffered_pts = 0; | |
1974 sh_video->next_frame_time = 0; | |
1975 | |
20947
6baefa24946f
moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents:
20915
diff
changeset
|
1976 if(auto_quality>0){ |
6baefa24946f
moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents:
20915
diff
changeset
|
1977 // Auto quality option enabled |
6baefa24946f
moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents:
20915
diff
changeset
|
1978 output_quality=get_video_quality_max(sh_video); |
6baefa24946f
moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents:
20915
diff
changeset
|
1979 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
|
1980 else output_quality=auto_quality; |
6baefa24946f
moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents:
20915
diff
changeset
|
1981 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
|
1982 set_video_quality(sh_video,output_quality); |
6baefa24946f
moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents:
20915
diff
changeset
|
1983 } |
6baefa24946f
moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents:
20915
diff
changeset
|
1984 |
6baefa24946f
moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents:
20915
diff
changeset
|
1985 // ========== 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
|
1986 |
6baefa24946f
moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents:
20915
diff
changeset
|
1987 current_module="init_vo"; |
6baefa24946f
moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents:
20915
diff
changeset
|
1988 |
6baefa24946f
moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents:
20915
diff
changeset
|
1989 return 1; |
21031
e45bb0ee5558
Make sure sh_video == NULL when reinit_video_chain fails.
reimar
parents:
21030
diff
changeset
|
1990 |
e45bb0ee5558
Make sure sh_video == NULL when reinit_video_chain fails.
reimar
parents:
21030
diff
changeset
|
1991 err_out: |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
1992 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
|
1993 return 0; |
20947
6baefa24946f
moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents:
20915
diff
changeset
|
1994 } |
20899
c00d8c1aa0ab
Replace sleep time calculation in main() with a separate function.
uau
parents:
20898
diff
changeset
|
1995 |
21077 | 1996 static double update_video(int *blit_frame) |
1997 { | |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
1998 sh_video_t * const sh_video = mpctx->sh_video; |
21077 | 1999 //-------------------- Decode a frame: ----------------------- |
2000 double frame_time; | |
2001 *blit_frame = 0; // Don't blit if we hit EOF | |
2002 if (!correct_pts) { | |
2003 unsigned char* start=NULL; | |
2004 void *decoded_frame; | |
2005 int drop_frame=0; | |
2006 int in_size; | |
2007 | |
2008 current_module = "video_read_frame"; | |
2009 frame_time = sh_video->next_frame_time; | |
2010 in_size = video_read_frame(sh_video, &sh_video->next_frame_time, | |
2011 &start, force_fps); | |
2012 if (in_size < 0) | |
2013 return -1; | |
2014 if (in_size > max_framesize) | |
2015 max_framesize = in_size; // stats | |
2016 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
|
2017 if (mpctx->sh_audio) |
22488 | 2018 mpctx->delay -= frame_time; |
21077 | 2019 // video_read_frame can change fps (e.g. for ASF video) |
2020 vo_fps = sh_video->fps; | |
2021 // check for frame-drop: | |
2022 current_module = "check_framedrop"; | |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
2023 if (mpctx->sh_audio && !mpctx->d_audio->eof) { |
21077 | 2024 static int dropped_frames; |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
2025 float delay = playback_speed*mpctx->audio_out->get_delay(); |
22488 | 2026 float d = delay-mpctx->delay; |
21077 | 2027 // we should avoid dropping too many frames in sequence unless we |
2028 // are too late. and we allow 100ms A-V delay here: | |
2029 if (d < -dropped_frames*frame_time-0.100 && | |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
2030 mpctx->osd_function != OSD_PAUSE) { |
21077 | 2031 drop_frame = frame_dropping; |
2032 ++drop_frame_cnt; | |
2033 ++dropped_frames; | |
2034 } else | |
2035 drop_frame = dropped_frames = 0; | |
2036 ++total_frame_cnt; | |
2037 } | |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
2038 update_subtitles(sh_video, mpctx->d_sub, 0); |
21077 | 2039 update_osd_msg(); |
2040 current_module = "decode_video"; | |
2041 decoded_frame = decode_video(sh_video, start, in_size, drop_frame, | |
2042 sh_video->pts); | |
2043 current_module = "filter_video"; | |
2044 *blit_frame = (decoded_frame && filter_video(sh_video, decoded_frame, | |
2045 sh_video->pts)); | |
2046 } | |
2047 else { | |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
2048 if (!generate_video_frame(sh_video, mpctx->d_video)) |
21077 | 2049 return -1; |
2050 ((vf_instance_t *)sh_video->vfilter)->control(sh_video->vfilter, | |
2051 VFCTRL_GET_PTS, &sh_video->pts); | |
2052 if (sh_video->pts == MP_NOPTS_VALUE) { | |
2053 mp_msg(MSGT_CPLAYER, MSGL_ERR, "pts after filters MISSING\n"); | |
2054 sh_video->pts = sh_video->last_pts; | |
2055 } | |
2056 if (sh_video->last_pts == MP_NOPTS_VALUE) | |
2057 sh_video->last_pts= sh_video->pts; | |
2058 else if (sh_video->last_pts >= sh_video->pts) { | |
2059 sh_video->last_pts = sh_video->pts; | |
23294 | 2060 mp_msg(MSGT_CPLAYER, MSGL_INFO, "pts value <= previous\n"); |
21077 | 2061 } |
2062 frame_time = sh_video->pts - sh_video->last_pts; | |
2063 sh_video->last_pts = sh_video->pts; | |
2064 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
|
2065 if(mpctx->sh_audio) |
22488 | 2066 mpctx->delay -= frame_time; |
21077 | 2067 *blit_frame = 1; |
2068 } | |
2069 return frame_time; | |
2070 } | |
2071 | |
21082 | 2072 void pause_loop(void) |
2073 { | |
2074 mp_cmd_t* cmd; | |
2075 if (!quiet) { | |
2076 // Small hack to display the pause message on the OSD line. | |
2077 // The pause string is: "\n == PAUSE == \r" so we need to | |
2078 // take the first and the last char out | |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
2079 if (term_osd && !mpctx->sh_video) { |
21082 | 2080 char msg[128] = MSGTR_Paused; |
2081 int mlen = strlen(msg); | |
2082 msg[mlen-1] = '\0'; | |
2083 set_osd_msg(OSD_MSG_PAUSE, 1, 0, "%s", msg+1); | |
2084 update_osd_msg(); | |
2085 } else | |
2086 mp_msg(MSGT_CPLAYER,MSGL_STATUS,MSGTR_Paused); | |
2087 mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_PAUSED\n"); | |
2088 } | |
2089 #ifdef HAVE_NEW_GUI | |
2090 if (use_gui) | |
2091 guiGetEvent(guiCEvent, (char *)guiSetPause); | |
2092 #endif | |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
2093 if (mpctx->video_out && mpctx->sh_video && vo_config_count) |
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
2094 mpctx->video_out->control(VOCTRL_PAUSE, NULL); |
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
2095 |
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
2096 if (mpctx->audio_out && mpctx->sh_audio) |
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
2097 mpctx->audio_out->pause(); // pause audio, keep data if possible |
21082 | 2098 |
2099 while ( (cmd = mp_input_get_cmd(20, 1, 1)) == NULL) { | |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
2100 if (mpctx->sh_video && mpctx->video_out && vo_config_count) |
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
2101 mpctx->video_out->check_events(); |
21082 | 2102 #ifdef HAVE_NEW_GUI |
2103 if (use_gui) { | |
2104 guiEventHandling(); | |
2105 guiGetEvent(guiReDraw, NULL); | |
2106 if (guiIntfStruct.Playing!=2 || (rel_seek_secs || abs_seek_pos)) | |
2107 break; | |
2108 } | |
2109 #endif | |
2110 #ifdef HAVE_MENU | |
2111 if (vf_menu) | |
2112 vf_menu_pause_update(vf_menu); | |
2113 #endif | |
2114 usec_sleep(20000); | |
2115 } | |
2116 if (cmd && cmd->id == MP_CMD_PAUSE) { | |
2117 cmd = mp_input_get_cmd(0,1,0); | |
2118 mp_cmd_free(cmd); | |
2119 } | |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
2120 mpctx->osd_function=OSD_PLAY; |
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
2121 if (mpctx->audio_out && mpctx->sh_audio) |
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
2122 mpctx->audio_out->resume(); // resume audio |
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
2123 if (mpctx->video_out && mpctx->sh_video && vo_config_count) |
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
2124 mpctx->video_out->control(VOCTRL_RESUME, NULL); // resume video |
21082 | 2125 (void)GetRelativeTime(); // ignore time that passed during pause |
2126 #ifdef HAVE_NEW_GUI | |
2127 if (use_gui) { | |
2128 if (guiIntfStruct.Playing == guiSetStop) | |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
2129 mpctx->eof = 1; |
21082 | 2130 else |
2131 guiGetEvent(guiCEvent, (char *)guiSetPlay); | |
2132 } | |
2133 #endif | |
2134 } | |
2135 | |
21764 | 2136 void print_version(void){ |
2137 mp_msg(MSGT_CPLAYER, MSGL_INFO, "%s\n", MP_TITLE); | |
2138 | |
2139 /* Test for CPU capabilities (and corresponding OS support) for optimizing */ | |
9003 | 2140 GetCpuCaps(&gCpuCaps); |
20577 | 2141 #ifdef ARCH_X86 |
6135 | 2142 mp_msg(MSGT_CPLAYER,MSGL_INFO,"CPUflags: MMX: %d MMX2: %d 3DNow: %d 3DNow2: %d SSE: %d SSE2: %d\n", |
2143 gCpuCaps.hasMMX,gCpuCaps.hasMMX2, | |
2272 | 2144 gCpuCaps.has3DNow, gCpuCaps.has3DNowExt, |
2145 gCpuCaps.hasSSE, gCpuCaps.hasSSE2); | |
3742 | 2146 #ifdef RUNTIME_CPUDETECT |
6930 | 2147 mp_msg(MSGT_CPLAYER,MSGL_INFO, MSGTR_CompiledWithRuntimeDetection); |
3742 | 2148 #else |
6930 | 2149 mp_msg(MSGT_CPLAYER,MSGL_INFO, MSGTR_CompiledWithCPUExtensions); |
3742 | 2150 #ifdef HAVE_MMX |
2151 mp_msg(MSGT_CPLAYER,MSGL_INFO," MMX"); | |
2152 #endif | |
2153 #ifdef HAVE_MMX2 | |
2154 mp_msg(MSGT_CPLAYER,MSGL_INFO," MMX2"); | |
2155 #endif | |
2156 #ifdef HAVE_3DNOW | |
2157 mp_msg(MSGT_CPLAYER,MSGL_INFO," 3DNow"); | |
2158 #endif | |
2159 #ifdef HAVE_3DNOWEX | |
2160 mp_msg(MSGT_CPLAYER,MSGL_INFO," 3DNowEx"); | |
2161 #endif | |
2162 #ifdef HAVE_SSE | |
2163 mp_msg(MSGT_CPLAYER,MSGL_INFO," SSE"); | |
2164 #endif | |
6135 | 2165 #ifdef HAVE_SSE2 |
2166 mp_msg(MSGT_CPLAYER,MSGL_INFO," SSE2"); | |
2167 #endif | |
18151 | 2168 mp_msg(MSGT_CPLAYER,MSGL_INFO,"\n"); |
16490
f17b3c152fd6
Add comments to a few #endif statements in order to make clear which
diego
parents:
16489
diff
changeset
|
2169 #endif /* RUNTIME_CPUDETECT */ |
20577 | 2170 #endif /* ARCH_X86 */ |
21764 | 2171 } |
2172 | |
22298 | 2173 |
2174 // Find the right mute status and record position for new file position | |
2175 static void edl_seek_reset(MPContext *mpctx) | |
2176 { | |
2177 mpctx->edl_muted = 0; | |
2178 next_edl_record = edl_records; | |
2179 | |
2180 while (next_edl_record) { | |
2181 if (next_edl_record->start_sec >= mpctx->sh_video->pts) | |
2182 break; | |
2183 | |
2184 if (next_edl_record->action == EDL_MUTE) | |
2185 mpctx->edl_muted = !mpctx->edl_muted; | |
2186 next_edl_record = next_edl_record->next; | |
2187 } | |
2188 if ((mpctx->user_muted | mpctx->edl_muted) != mpctx->mixer.muted) | |
2189 mixer_mute(&mpctx->mixer); | |
2190 } | |
2191 | |
2192 | |
2193 // Execute EDL command for the current position if one exists | |
2194 static void edl_update(MPContext *mpctx) | |
2195 { | |
2196 if (!next_edl_record) | |
2197 return; | |
2198 | |
2199 if (!mpctx->sh_video) { | |
2200 mp_msg(MSGT_CPLAYER, MSGL_ERR, MSGTR_EdlNOsh_video); | |
2201 free_edl(edl_records); | |
2202 next_edl_record = NULL; | |
2203 edl_records = NULL; | |
2204 return; | |
2205 } | |
2206 | |
2207 if (mpctx->sh_video->pts >= next_edl_record->start_sec) { | |
2208 if (next_edl_record->action == EDL_SKIP) { | |
2209 mpctx->osd_function = OSD_FFW; | |
2210 abs_seek_pos = 0; | |
2211 rel_seek_secs = next_edl_record->length_sec; | |
2212 mp_msg(MSGT_CPLAYER, MSGL_DBG4, "EDL_SKIP: start [%f], stop " | |
2213 "[%f], length [%f]\n", next_edl_record->start_sec, | |
2214 next_edl_record->stop_sec, next_edl_record->length_sec); | |
2215 edl_decision = 1; | |
2216 } | |
2217 else if (next_edl_record->action == EDL_MUTE) { | |
2218 mpctx->edl_muted = !mpctx->edl_muted; | |
2219 if ((mpctx->user_muted | mpctx->edl_muted) != mpctx->mixer.muted) | |
2220 mixer_mute(&mpctx->mixer); | |
2221 mp_msg(MSGT_CPLAYER, MSGL_DBG4, "EDL_MUTE: [%f]\n", | |
2222 next_edl_record->start_sec ); | |
2223 } | |
2224 next_edl_record = next_edl_record->next; | |
2225 } | |
2226 } | |
2227 | |
2228 | |
22302 | 2229 // style & 1 == 0 means seek relative to current position, == 1 means absolute |
22300 | 2230 // style & 2 == 0 means amount in seconds, == 2 means fraction of file length |
2231 // return -1 if seek failed (non-seekable stream?), 0 otherwise | |
2232 static int seek(MPContext *mpctx, double amount, int style) | |
2233 { | |
2234 current_module = "seek"; | |
2235 if (demux_seek(mpctx->demuxer, amount, audio_delay, style) == 0) | |
2236 return -1; | |
2237 | |
2238 if (mpctx->sh_video) { | |
2239 current_module = "seek_video_reset"; | |
2240 resync_video_stream(mpctx->sh_video); | |
2241 if (vo_config_count) | |
2242 mpctx->video_out->control(VOCTRL_RESET, NULL); | |
2243 mpctx->sh_video->num_buffered_pts = 0; | |
2244 mpctx->sh_video->last_pts = MP_NOPTS_VALUE; | |
2245 mpctx->num_buffered_frames = 0; | |
22488 | 2246 mpctx->delay = 0; |
22300 | 2247 // Not all demuxers set d_video->pts during seek, so this value |
2248 // (which is used by at least vobsub and edl code below) may | |
2249 // be completely wrong (probably 0). | |
2250 mpctx->sh_video->pts = mpctx->d_video->pts; | |
2251 update_subtitles(mpctx->sh_video, mpctx->d_sub, 1); | |
2252 } | |
2253 | |
2254 if (mpctx->sh_audio) { | |
2255 current_module = "seek_audio_reset"; | |
2256 mpctx->audio_out->reset(); // stop audio, throwing away buffered data | |
2257 mpctx->sh_audio->a_buffer_len = 0; | |
2258 mpctx->sh_audio->a_out_buffer_len = 0; | |
2259 } | |
2260 | |
2261 if (vo_vobsub) { | |
2262 current_module = "seek_vobsub_reset"; | |
2263 vobsub_seek(vo_vobsub, mpctx->sh_video->pts); | |
2264 } | |
2265 | |
2266 edl_seek_reset(mpctx); | |
2267 | |
2268 c_total = 0; | |
2269 max_pts_correction = 0.1; | |
2270 audio_time_usage = 0; video_time_usage = 0; vout_time_usage = 0; | |
2271 drop_frame_cnt = 0; | |
2272 | |
2273 current_module = NULL; | |
2274 return 0; | |
2275 } | |
2276 | |
21764 | 2277 int main(int argc,char* argv[]){ |
2278 | |
2279 | |
2280 char * mem_ptr; | |
2281 | |
2282 // movie info: | |
2283 | |
2284 /* Flag indicating whether MPlayer should exit without playing anything. */ | |
2285 int opt_exit = 0; | |
2286 | |
2287 //float a_frame=0; // Audio | |
2288 | |
2289 int i; | |
2290 | |
2291 int gui_no_filename=0; | |
2292 | |
2293 srand((int) time(NULL)); | |
2294 | |
2295 InitTimer(); | |
2296 | |
2297 mp_msg_init(); | |
2298 | |
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
|
2299 for(i=1; i<argc; i++) |
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
|
2300 if(!strcmp(argv[i], "-really-quiet")) |
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
|
2301 verbose= -10; |
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
|
2302 |
21764 | 2303 print_version(); |
10646 | 2304 #if defined(WIN32) && defined(USE_WIN32DLL) |
16781
6809ca5dd307
allow mencoder to load win32 codecs properly patch by Zuxy <zuxy.meng at gmail.com>
faust3
parents:
16758
diff
changeset
|
2305 set_path_env(); |
10646 | 2306 #endif /*WIN32 && USE_WIN32DLL*/ |
2307 | |
7068
6c2d746b17bf
10l, fix compiling without tv. patch by Andreas Hess <jaska@gmx.net>
arpi
parents:
7058
diff
changeset
|
2308 #ifdef USE_TV |
5572
8cd761968f35
BSD-BT848 TV update patch by Charles Henrich <henrich@sigbus.com>
arpi
parents:
5520
diff
changeset
|
2309 tv_param_immediate = 1; |
7068
6c2d746b17bf
10l, fix compiling without tv. patch by Andreas Hess <jaska@gmx.net>
arpi
parents:
7058
diff
changeset
|
2310 #endif |
5572
8cd761968f35
BSD-BT848 TV update patch by Charles Henrich <henrich@sigbus.com>
arpi
parents:
5520
diff
changeset
|
2311 |
19355
ba95c4fa0684
Reintroduce an ugly variant of the -gui/-nogui options.
reimar
parents:
19342
diff
changeset
|
2312 if (argc > 1 && argv[1] && |
ba95c4fa0684
Reintroduce an ugly variant of the -gui/-nogui options.
reimar
parents:
19342
diff
changeset
|
2313 (!strcmp(argv[1], "-gui") || !strcmp(argv[1], "-nogui"))) { |
ba95c4fa0684
Reintroduce an ugly variant of the -gui/-nogui options.
reimar
parents:
19342
diff
changeset
|
2314 use_gui = !strcmp(argv[1], "-gui"); |
ba95c4fa0684
Reintroduce an ugly variant of the -gui/-nogui options.
reimar
parents:
19342
diff
changeset
|
2315 } else |
1709 | 2316 if ( argv[0] ) |
18939
cde5b56f1610
Change use_gui detection to accept also filenames only containing
reimar
parents:
18938
diff
changeset
|
2317 { |
cde5b56f1610
Change use_gui detection to accept also filenames only containing
reimar
parents:
18938
diff
changeset
|
2318 char *base = strrchr(argv[0], '/'); |
cde5b56f1610
Change use_gui detection to accept also filenames only containing
reimar
parents:
18938
diff
changeset
|
2319 if (!base) |
cde5b56f1610
Change use_gui detection to accept also filenames only containing
reimar
parents:
18938
diff
changeset
|
2320 base = strrchr(argv[0], '\\'); |
cde5b56f1610
Change use_gui detection to accept also filenames only containing
reimar
parents:
18938
diff
changeset
|
2321 if (!base) |
cde5b56f1610
Change use_gui detection to accept also filenames only containing
reimar
parents:
18938
diff
changeset
|
2322 base = argv[0]; |
cde5b56f1610
Change use_gui detection to accept also filenames only containing
reimar
parents:
18938
diff
changeset
|
2323 if(strstr(base, "gmplayer")) |
1709 | 2324 use_gui=1; |
18939
cde5b56f1610
Change use_gui detection to accept also filenames only containing
reimar
parents:
18938
diff
changeset
|
2325 } |
1639 | 2326 |
8164
487cfc28525d
New config system + cleanup of header inter dependency
albeu
parents:
8123
diff
changeset
|
2327 mconfig = m_config_new(); |
4156
22fadd4022b5
playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents:
4152
diff
changeset
|
2328 m_config_register_options(mconfig,mplayer_opts); |
22fadd4022b5
playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents:
4152
diff
changeset
|
2329 // TODO : add something to let modules register their options |
7867 | 2330 mp_input_register_options(mconfig); |
4156
22fadd4022b5
playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents:
4152
diff
changeset
|
2331 parse_cfgfiles(mconfig); |
22fadd4022b5
playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents:
4152
diff
changeset
|
2332 |
7019 | 2333 #ifdef HAVE_NEW_GUI |
2334 if ( use_gui ) cfg_read(); | |
2335 #endif | |
4156
22fadd4022b5
playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents:
4152
diff
changeset
|
2336 |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
2337 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
|
2338 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
|
2339 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
|
2340 else { |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
2341 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
|
2342 if(mpctx->playtree) { |
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
2343 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
|
2344 if(mpctx->playtree_iter) { |
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
2345 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
|
2346 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
|
2347 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
|
2348 } |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
2349 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
|
2350 } |
898caa690c0b
playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents:
3934
diff
changeset
|
2351 } |
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
|
2352 } |
4045
898caa690c0b
playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents:
3934
diff
changeset
|
2353 |
18913 | 2354 #if defined(WIN32) && defined(HAVE_NEW_GUI) |
2355 void *runningmplayer = FindWindow("MPlayer GUI for Windows", "MPlayer for Windows"); | |
2356 if(runningmplayer && filename && use_gui){ | |
2357 COPYDATASTRUCT csData; | |
2358 char file[MAX_PATH]; | |
2359 char *filepart = filename; | |
2360 if(GetFullPathName(filename, MAX_PATH, file, &filepart)){ | |
2361 csData.dwData = 0; | |
2362 csData.cbData = strlen(file)*2; | |
2363 csData.lpData = file; | |
2364 SendMessage(runningmplayer, WM_COPYDATA, (WPARAM)runningmplayer, (LPARAM)&csData); | |
2365 } | |
2366 } | |
2367 #endif | |
2368 | |
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
|
2369 #ifdef WIN32 |
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
|
2370 if(proc_priority){ |
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
|
2371 int i; |
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
|
2372 for(i=0; priority_presets_defs[i].name; i++){ |
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
|
2373 if(strcasecmp(priority_presets_defs[i].name, proc_priority) == 0) |
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
|
2374 break; |
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
|
2375 } |
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
|
2376 mp_msg(MSGT_CPLAYER,MSGL_STATUS,"Setting process priority: %s\n", |
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
|
2377 priority_presets_defs[i].name); |
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
|
2378 SetPriorityClass(GetCurrentProcess(), priority_presets_defs[i].prio); |
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
|
2379 } |
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
|
2380 #endif |
1709 | 2381 #ifndef HAVE_NEW_GUI |
2382 if(use_gui){ | |
1973
5216f108cb4f
all error/warn/info messages moved to help_mp-en.h for translation
arpi
parents:
1962
diff
changeset
|
2383 mp_msg(MSGT_CPLAYER,MSGL_WARN,MSGTR_NoGui); |
1709 | 2384 use_gui=0; |
2385 } | |
1723
5e4214a7540e
GUI stuff. now seeking works, and xmga renders to video window
arpi
parents:
1709
diff
changeset
|
2386 #else |
18945
337d4324c766
No point in checking for X for windows gui, in addition the hackish
reimar
parents:
18939
diff
changeset
|
2387 #ifndef WIN32 |
1723
5e4214a7540e
GUI stuff. now seeking works, and xmga renders to video window
arpi
parents:
1709
diff
changeset
|
2388 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
|
2389 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
|
2390 use_gui=0; |
5e4214a7540e
GUI stuff. now seeking works, and xmga renders to video window
arpi
parents:
1709
diff
changeset
|
2391 } |
18945
337d4324c766
No point in checking for X for windows gui, in addition the hackish
reimar
parents:
18939
diff
changeset
|
2392 #endif |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
2393 if (use_gui && mpctx->playtree_iter){ |
9319 | 2394 char cwd[PATH_MAX+2]; |
18316
b3be7df634b0
spelling/grammar/wording fixes in doxygen and non-doxygen comments
diego
parents:
18315
diff
changeset
|
2395 // 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
|
2396 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
|
2397 mpctx->playtree_iter=NULL; |
9301
7841308ad250
this patch fixes latest bug, discovered by .so ... (relative filenames &
arpi
parents:
9291
diff
changeset
|
2398 |
9318
51a9af80d874
PATH_MAX should be more portable, and we even include limits.h to be sure
arpi
parents:
9317
diff
changeset
|
2399 if (getcwd(cwd, PATH_MAX) != (char *)NULL) |
9301
7841308ad250
this patch fixes latest bug, discovered by .so ... (relative filenames &
arpi
parents:
9291
diff
changeset
|
2400 { |
7841308ad250
this patch fixes latest bug, discovered by .so ... (relative filenames &
arpi
parents:
9291
diff
changeset
|
2401 strcat(cwd, "/"); |
7841308ad250
this patch fixes latest bug, discovered by .so ... (relative filenames &
arpi
parents:
9291
diff
changeset
|
2402 // 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
|
2403 play_tree_add_bpf(mpctx->playtree, cwd); |
9301
7841308ad250
this patch fixes latest bug, discovered by .so ... (relative filenames &
arpi
parents:
9291
diff
changeset
|
2404 } |
18316
b3be7df634b0
spelling/grammar/wording fixes in doxygen and non-doxygen comments
diego
parents:
18315
diff
changeset
|
2405 // 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
|
2406 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
|
2407 } |
16490
f17b3c152fd6
Add comments to a few #endif statements in order to make clear which
diego
parents:
16489
diff
changeset
|
2408 #endif /* HAVE_NEW_GUI */ |
1709 | 2409 |
7562
92188b57a062
video out driver list support (like -vc, example: -vo xmga,xv,x11,)
arpi
parents:
7559
diff
changeset
|
2410 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
|
2411 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
|
2412 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
|
2413 } |
5072 | 2414 |
7563
e9e4398029de
audio out driver list support (example: -ao alsa9,sdl:esd,oss,sdl:oss,)
arpi
parents:
7562
diff
changeset
|
2415 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
|
2416 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
|
2417 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
|
2418 } |
1639 | 2419 |
18316
b3be7df634b0
spelling/grammar/wording fixes in doxygen and non-doxygen comments
diego
parents:
18315
diff
changeset
|
2420 /* Check codecs.conf. */ |
11759
29eea271490e
add -codecs-file for selecting a specific codecs.conf on the comand line
attila
parents:
11592
diff
changeset
|
2421 if(!codecs_file || !parse_codec_cfg(codecs_file)){ |
12890 | 2422 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
|
2423 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
|
2424 if(!parse_codec_cfg(NULL)){ |
13500 | 2425 exit_player_with_rc(NULL, 0); |
11759
29eea271490e
add -codecs-file for selecting a specific codecs.conf on the comand line
attila
parents:
11592
diff
changeset
|
2426 } |
13946 | 2427 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
|
2428 } |
1983 | 2429 } |
12890 | 2430 free( mem_ptr ); // release the buffer created by get_path() |
1983 | 2431 } |
2432 | |
7506
c1cb94198e05
-vc/-vfm accepts codec/driver _list_ now. empty list element for -vc means
arpi
parents:
7502
diff
changeset
|
2433 #if 0 |
c1cb94198e05
-vc/-vfm accepts codec/driver _list_ now. empty list element for -vc means
arpi
parents:
7502
diff
changeset
|
2434 if(video_codec_list){ |
c1cb94198e05
-vc/-vfm accepts codec/driver _list_ now. empty list element for -vc means
arpi
parents:
7502
diff
changeset
|
2435 int i; |
c1cb94198e05
-vc/-vfm accepts codec/driver _list_ now. empty list element for -vc means
arpi
parents:
7502
diff
changeset
|
2436 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
|
2437 for(i=0;video_codec_list[i];i++) |
13577 | 2438 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
|
2439 } |
c1cb94198e05
-vc/-vfm accepts codec/driver _list_ now. empty list element for -vc means
arpi
parents:
7502
diff
changeset
|
2440 #endif |
7522 | 2441 if(audio_codec_list && strcmp(audio_codec_list[0],"help")==0){ |
6930 | 2442 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
|
2443 mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_AUDIO_CODECS\n"); |
1983 | 2444 list_codecs(1); |
13577 | 2445 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
|
2446 opt_exit = 1; |
1983 | 2447 } |
7506
c1cb94198e05
-vc/-vfm accepts codec/driver _list_ now. empty list element for -vc means
arpi
parents:
7502
diff
changeset
|
2448 if(video_codec_list && strcmp(video_codec_list[0],"help")==0){ |
6930 | 2449 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
|
2450 mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_VIDEO_CODECS\n"); |
1983 | 2451 list_codecs(0); |
13577 | 2452 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
|
2453 opt_exit = 1; |
1983 | 2454 } |
7506
c1cb94198e05
-vc/-vfm accepts codec/driver _list_ now. empty list element for -vc means
arpi
parents:
7502
diff
changeset
|
2455 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
|
2456 vfm_help(); |
13577 | 2457 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
|
2458 opt_exit = 1; |
7191
1eadce15446c
-afm/-vfm help implemenetd, some cosmetics of ad/vd codec names/comments
arpi
parents:
7180
diff
changeset
|
2459 } |
7522 | 2460 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
|
2461 afm_help(); |
13577 | 2462 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
|
2463 opt_exit = 1; |
7191
1eadce15446c
-afm/-vfm help implemenetd, some cosmetics of ad/vd codec names/comments
arpi
parents:
7180
diff
changeset
|
2464 } |
13269
aa13937da8a0
mplayer -af help now lists all available audio filters.
ivo
parents:
13228
diff
changeset
|
2465 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
|
2466 af_help(); |
aa13937da8a0
mplayer -af help now lists all available audio filters.
ivo
parents:
13228
diff
changeset
|
2467 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
|
2468 opt_exit = 1; |
13269
aa13937da8a0
mplayer -af help now lists all available audio filters.
ivo
parents:
13228
diff
changeset
|
2469 } |
9336 | 2470 #ifdef HAVE_X11 |
9317
c7f5df43b937
- support command line parameter -fstype, eg. -fstype layer=12,above,fullscreen
filon
parents:
9315
diff
changeset
|
2471 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
|
2472 fstype_help(); |
13577 | 2473 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
|
2474 opt_exit = 1; |
9317
c7f5df43b937
- support command line parameter -fstype, eg. -fstype layer=12,above,fullscreen
filon
parents:
9315
diff
changeset
|
2475 } |
9336 | 2476 #endif |
16175 | 2477 if((demuxer_name && strcmp(demuxer_name,"help")==0) || |
2478 (audio_demuxer_name && strcmp(audio_demuxer_name,"help")==0) || | |
2479 (sub_demuxer_name && strcmp(sub_demuxer_name,"help")==0)){ | |
2480 demuxer_help(); | |
2481 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
|
2482 opt_exit = 1; |
16175 | 2483 } |
17914
f9cb6fc1608a
Add an option to list the properties: -list-properties
albeu
parents:
17911
diff
changeset
|
2484 if(list_properties) { |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
2485 property_print_help(); |
17914
f9cb6fc1608a
Add an option to list the properties: -list-properties
albeu
parents:
17911
diff
changeset
|
2486 opt_exit = 1; |
f9cb6fc1608a
Add an option to list the properties: -list-properties
albeu
parents:
17911
diff
changeset
|
2487 } |
1983 | 2488 |
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
|
2489 if(opt_exit) |
feb16d0117c8
allow multiple help clauses on the command line, Patch by kiriuja " mplayer-patches AH en-directo POUM net "
gpoirier
parents:
16323
diff
changeset
|
2490 exit_player(NULL); |
feb16d0117c8
allow multiple help clauses on the command line, Patch by kiriuja " mplayer-patches AH en-directo POUM net "
gpoirier
parents:
16323
diff
changeset
|
2491 |
16347
da2926d990ce
Adds -idle, an option to make MPlayer wait for input ('loadfile' or
ods15
parents:
16346
diff
changeset
|
2492 if (player_idle_mode && use_gui) { |
da2926d990ce
Adds -idle, an option to make MPlayer wait for input ('loadfile' or
ods15
parents:
16346
diff
changeset
|
2493 mp_msg(MSGT_CPLAYER, MSGL_FATAL, MSGTR_NoIdleAndGui); |
da2926d990ce
Adds -idle, an option to make MPlayer wait for input ('loadfile' or
ods15
parents:
16346
diff
changeset
|
2494 exit_player_with_rc(NULL, 1); |
da2926d990ce
Adds -idle, an option to make MPlayer wait for input ('loadfile' or
ods15
parents:
16346
diff
changeset
|
2495 } |
da2926d990ce
Adds -idle, an option to make MPlayer wait for input ('loadfile' or
ods15
parents:
16346
diff
changeset
|
2496 |
da2926d990ce
Adds -idle, an option to make MPlayer wait for input ('loadfile' or
ods15
parents:
16346
diff
changeset
|
2497 if(!filename && !player_idle_mode){ |
1787
de6a0987a08d
stop fixed, fileselector supp. maybe not work, couldn't test
arpi
parents:
1772
diff
changeset
|
2498 if(!use_gui){ |
1690 | 2499 // no file/vcd/dvd -> show HELP: |
5112 | 2500 mp_msg(MSGT_CPLAYER, MSGL_INFO, help_text); |
13500 | 2501 exit_player_with_rc(NULL, 0); |
1787
de6a0987a08d
stop fixed, fileselector supp. maybe not work, couldn't test
arpi
parents:
1772
diff
changeset
|
2502 } else gui_no_filename=1; |
1690 | 2503 } |
2504 | |
21342
dc98645820b7
Make MPlayer/MEncoder print the compile-time configuration in verbose mode.
diego
parents:
21219
diff
changeset
|
2505 /* Display what configure line was used */ |
dc98645820b7
Make MPlayer/MEncoder print the compile-time configuration in verbose mode.
diego
parents:
21219
diff
changeset
|
2506 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
|
2507 |
1690 | 2508 // Many users forget to include command line in bugreports... |
17932 | 2509 if( mp_msg_test(MSGT_CPLAYER,MSGL_V) ){ |
13577 | 2510 mp_msg(MSGT_CPLAYER, MSGL_INFO, MSGTR_CommandLine); |
14530 | 2511 for(i=1;i<argc;i++)mp_msg(MSGT_CPLAYER, MSGL_INFO," '%s'",argv[i]); |
2512 mp_msg(MSGT_CPLAYER, MSGL_INFO, "\n"); | |
1690 | 2513 } |
2514 | |
1639 | 2515 //------ load global data first ------ |
955 | 2516 |
11580
90953d955165
Fontconfig support based on patch by Arwed von Merkatz <v.merkatz@gmx.net>, but slightly reworked
alex
parents:
11542
diff
changeset
|
2517 // check font |
90953d955165
Fontconfig support based on patch by Arwed von Merkatz <v.merkatz@gmx.net>, but slightly reworked
alex
parents:
11542
diff
changeset
|
2518 #ifdef HAVE_FREETYPE |
90953d955165
Fontconfig support based on patch by Arwed von Merkatz <v.merkatz@gmx.net>, but slightly reworked
alex
parents:
11542
diff
changeset
|
2519 init_freetype(); |
90953d955165
Fontconfig support based on patch by Arwed von Merkatz <v.merkatz@gmx.net>, but slightly reworked
alex
parents:
11542
diff
changeset
|
2520 #endif |
90953d955165
Fontconfig support based on patch by Arwed von Merkatz <v.merkatz@gmx.net>, but slightly reworked
alex
parents:
11542
diff
changeset
|
2521 #ifdef HAVE_FONTCONFIG |
90953d955165
Fontconfig support based on patch by Arwed von Merkatz <v.merkatz@gmx.net>, but slightly reworked
alex
parents:
11542
diff
changeset
|
2522 if(!font_fontconfig) |
90953d955165
Fontconfig support based on patch by Arwed von Merkatz <v.merkatz@gmx.net>, but slightly reworked
alex
parents:
11542
diff
changeset
|
2523 { |
90953d955165
Fontconfig support based on patch by Arwed von Merkatz <v.merkatz@gmx.net>, but slightly reworked
alex
parents:
11542
diff
changeset
|
2524 #endif |
19485
d04ee0eb6a11
support for disabling/enabling bitmap font support from configure
diego
parents:
19478
diff
changeset
|
2525 #ifdef HAVE_BITMAP_FONT |
212 | 2526 if(font_name){ |
337 | 2527 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
|
2528 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
|
2529 filename_recode(font_name)); |
220 | 2530 } else { |
2531 // try default: | |
12890 | 2532 vo_font=read_font_desc( mem_ptr=get_path("font/font.desc"),font_factor,verbose>1); |
2533 free(mem_ptr); // release the buffer created by get_path() | |
1353 | 2534 if(!vo_font) |
10272
7b0bc557987b
renames: DATADIR->MPLAYER_DATADIR, CONFDIR->MPLAYER_CONFDIR, LIBDIR->MPLAYER_LIBDIR
arpi
parents:
10240
diff
changeset
|
2535 vo_font=read_font_desc(MPLAYER_DATADIR "/font/font.desc",font_factor,verbose>1); |
212 | 2536 } |
23338
2a66d95355f0
add new -subfont option, that allows having a different font for OSD (controls and menu) and subtitles
ben
parents:
23294
diff
changeset
|
2537 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
|
2538 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
|
2539 else |
2a66d95355f0
add new -subfont option, that allows having a different font for OSD (controls and menu) and subtitles
ben
parents:
23294
diff
changeset
|
2540 sub_font = vo_font; |
19485
d04ee0eb6a11
support for disabling/enabling bitmap font support from configure
diego
parents:
19478
diff
changeset
|
2541 #endif |
11580
90953d955165
Fontconfig support based on patch by Arwed von Merkatz <v.merkatz@gmx.net>, but slightly reworked
alex
parents:
11542
diff
changeset
|
2542 #ifdef HAVE_FONTCONFIG |
90953d955165
Fontconfig support based on patch by Arwed von Merkatz <v.merkatz@gmx.net>, but slightly reworked
alex
parents:
11542
diff
changeset
|
2543 } |
1422 | 2544 #endif |
21161 | 2545 |
5638
86663f1b9b00
new osd code, use osd objs to follow changes and do minimal updates
arpi
parents:
5627
diff
changeset
|
2546 vo_init_osd(); |
86663f1b9b00
new osd code, use osd objs to follow changes and do minimal updates
arpi
parents:
5627
diff
changeset
|
2547 |
20477 | 2548 #ifdef USE_ASS |
20502 | 2549 ass_library = ass_init(); |
20477 | 2550 #endif |
2551 | |
3015 | 2552 #ifdef HAVE_RTC |
5055 | 2553 if(!nortc) |
2554 { | |
7494 | 2555 // seteuid(0); /* Can't hurt to try to get root here */ |
12681 | 2556 if ((rtc_fd = open(rtc_device ? rtc_device : "/dev/rtc", O_RDONLY)) < 0) |
13577 | 2557 mp_msg(MSGT_CPLAYER, MSGL_WARN, MSGTR_RTCDeviceNotOpenable, |
12681 | 2558 rtc_device ? rtc_device : "/dev/rtc", strerror(errno)); |
7494 | 2559 else { |
2560 unsigned long irqp = 1024; /* 512 seemed OK. 128 is jerky. */ | |
2561 | |
2562 if (ioctl(rtc_fd, RTC_IRQP_SET, irqp) < 0) { | |
13577 | 2563 mp_msg(MSGT_CPLAYER, MSGL_WARN, MSGTR_LinuxRTCInitErrorIrqpSet, irqp, strerror(errno)); |
2564 mp_msg(MSGT_CPLAYER, MSGL_HINT, MSGTR_IncreaseRTCMaxUserFreq, irqp); | |
7494 | 2565 close (rtc_fd); |
2889
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
2566 rtc_fd = -1; |
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
2567 } 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
|
2568 /* variable only by the root */ |
13577 | 2569 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
|
2570 close (rtc_fd); |
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
2571 rtc_fd = -1; |
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
2572 } else |
13946 | 2573 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
|
2574 } |
5055 | 2575 } |
4176
116abdd0aed1
small gtk bug fix (-display bug, baze gabu, miattad fogok elkarhozni:), and remove gui dependencie in mencoder
pontscho
parents:
4160
diff
changeset
|
2576 #ifdef HAVE_NEW_GUI |
3825 | 2577 // 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
|
2578 // 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
|
2579 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
|
2580 #endif |
2889
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
2581 if(rtc_fd<0) |
16490
f17b3c152fd6
Add comments to a few #endif statements in order to make clear which
diego
parents:
16489
diff
changeset
|
2582 #endif /* HAVE_RTC */ |
13946 | 2583 mp_msg(MSGT_CPLAYER, MSGL_V, "Using %s timing\n", |
12954 | 2584 softsleep?"software":timer_name); |
2889
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
2585 |
1639 | 2586 #ifdef USE_TERMCAP |
3618 | 2587 if ( !use_gui ) load_termcap(NULL); // load key-codes |
1639 | 2588 #endif |
2589 | |
1816 | 2590 // ========== Init keyboard FIFO (connection to libvo) ============ |
1694 | 2591 |
4418
8141d2c399e4
A new configurable input system and joystick support for this system
albeu
parents:
4395
diff
changeset
|
2592 // Init input system |
8141d2c399e4
A new configurable input system and joystick support for this system
albeu
parents:
4395
diff
changeset
|
2593 current_module = "init_input"; |
17890
633f3d0a621b
Enable gui key bindings only when running the gui. Fix enter and esc
albeu
parents:
17732
diff
changeset
|
2594 mp_input_init(use_gui); |
9831 | 2595 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
|
2596 if(slave_mode) |
10928 | 2597 #ifndef __MINGW32__ |
4418
8141d2c399e4
A new configurable input system and joystick support for this system
albeu
parents:
4395
diff
changeset
|
2598 mp_input_add_cmd_fd(0,1,NULL,NULL); |
10928 | 2599 #else |
2600 mp_input_add_cmd_fd(0,0,mp_input_win32_slave_cmd_func,NULL); | |
2601 #endif | |
12816 | 2602 else if(!noconsolecontrols) |
22751
3d83d77f5a6b
Invert logic for HAVE_NO_POSIX_SELECT to HAVE_POSIX_SELECT to be in line
diego
parents:
22498
diff
changeset
|
2603 #ifdef HAVE_POSIX_SELECT |
4418
8141d2c399e4
A new configurable input system and joystick support for this system
albeu
parents:
4395
diff
changeset
|
2604 mp_input_add_key_fd(0,1,NULL,NULL); |
9831 | 2605 #else |
2606 mp_input_add_key_fd(0,0,NULL,NULL); | |
2607 #endif | |
2608 | |
4431 | 2609 inited_flags|=INITED_INPUT; |
4418
8141d2c399e4
A new configurable input system and joystick support for this system
albeu
parents:
4395
diff
changeset
|
2610 current_module = NULL; |
8141d2c399e4
A new configurable input system and joystick support for this system
albeu
parents:
4395
diff
changeset
|
2611 |
8198 | 2612 #ifdef HAVE_MENU |
2613 if(use_menu) { | |
22284 | 2614 if(menu_cfg && menu_init(mpctx, menu_cfg)) |
13577 | 2615 mp_msg(MSGT_CPLAYER,MSGL_INFO,MSGTR_MenuInitialized, menu_cfg); |
8198 | 2616 else { |
8723
48a2c2545d5c
Use system-wide menu.conf file if nothing else is availible,
filon
parents:
8672
diff
changeset
|
2617 menu_cfg = get_path("menu.conf"); |
22284 | 2618 if(menu_init(mpctx, menu_cfg)) |
13577 | 2619 mp_msg(MSGT_CPLAYER,MSGL_INFO,MSGTR_MenuInitialized, menu_cfg); |
8723
48a2c2545d5c
Use system-wide menu.conf file if nothing else is availible,
filon
parents:
8672
diff
changeset
|
2620 else { |
22284 | 2621 if(menu_init(mpctx, MPLAYER_CONFDIR "/menu.conf")) |
13577 | 2622 mp_msg(MSGT_CPLAYER,MSGL_INFO,MSGTR_MenuInitialized, MPLAYER_CONFDIR"/menu.conf"); |
8723
48a2c2545d5c
Use system-wide menu.conf file if nothing else is availible,
filon
parents:
8672
diff
changeset
|
2623 else { |
13577 | 2624 mp_msg(MSGT_CPLAYER,MSGL_INFO,MSGTR_MenuInitFailed); |
8723
48a2c2545d5c
Use system-wide menu.conf file if nothing else is availible,
filon
parents:
8672
diff
changeset
|
2625 use_menu = 0; |
48a2c2545d5c
Use system-wide menu.conf file if nothing else is availible,
filon
parents:
8672
diff
changeset
|
2626 } |
48a2c2545d5c
Use system-wide menu.conf file if nothing else is availible,
filon
parents:
8672
diff
changeset
|
2627 } |
8198 | 2628 } |
2629 } | |
2630 #endif | |
2631 | |
13391 | 2632 /// Catch signals |
2633 #ifndef __MINGW32__ | |
2634 signal(SIGCHLD,child_sighandler); | |
2635 #endif | |
4418
8141d2c399e4
A new configurable input system and joystick support for this system
albeu
parents:
4395
diff
changeset
|
2636 |
13794 | 2637 #ifdef CRASH_DEBUG |
2638 prog_path = argv[0]; | |
2639 #endif | |
1639 | 2640 //========= Catch terminate signals: ================ |
2641 // terminate requests: | |
2642 signal(SIGTERM,exit_sighandler); // kill | |
2643 signal(SIGHUP,exit_sighandler); // kill -HUP / xterm closed | |
2644 | |
1729 | 2645 signal(SIGINT,exit_sighandler); // Interrupt from keyboard |
1639 | 2646 |
2647 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
|
2648 signal(SIGPIPE,exit_sighandler); // Some window managers cause this |
5367
658ea5d7316a
Allow to disable crasj sighandler to enable creation of coredump files.
atmos4
parents:
5326
diff
changeset
|
2649 #ifdef ENABLE_SIGHANDLER |
1639 | 2650 // fatal errors: |
2651 signal(SIGBUS,exit_sighandler); // bus error | |
2652 signal(SIGSEGV,exit_sighandler); // segfault | |
2653 signal(SIGILL,exit_sighandler); // illegal instruction | |
2654 signal(SIGFPE,exit_sighandler); // floating point exc. | |
2655 signal(SIGABRT,exit_sighandler); // abort() | |
13794 | 2656 #ifdef CRASH_DEBUG |
2657 if (crash_debug) | |
2658 signal(SIGTRAP,exit_sighandler); | |
2659 #endif | |
5367
658ea5d7316a
Allow to disable crasj sighandler to enable creation of coredump files.
atmos4
parents:
5326
diff
changeset
|
2660 #endif |
1639 | 2661 |
4963 | 2662 #ifdef HAVE_NEW_GUI |
2663 if(use_gui){ | |
6218 | 2664 guiInit(); |
22286 | 2665 guiGetEvent(guiSetContext, mpctx); |
4963 | 2666 inited_flags|=INITED_GUI; |
4974 | 2667 guiGetEvent( guiCEvent,(char *)((gui_no_filename) ? 0 : 1) ); |
4963 | 2668 } |
2669 #endif | |
2670 | |
5983 | 2671 // ******************* Now, let's see the per-file stuff ******************** |
2672 | |
1639 | 2673 play_next_file: |
1787
de6a0987a08d
stop fixed, fileselector supp. maybe not work, couldn't test
arpi
parents:
1772
diff
changeset
|
2674 |
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
|
2675 // init global sub numbers |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
2676 mpctx->global_sub_size = 0; |
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
2677 { 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
|
2678 |
8614
49e36bf2f342
The patch adds support for a per-file config, which is loaded before
arpi
parents:
8612
diff
changeset
|
2679 if (filename) load_per_file_config (mconfig, filename); |
49e36bf2f342
The patch adds support for a per-file config, which is loaded before
arpi
parents:
8612
diff
changeset
|
2680 |
4835
1f59d4d73558
Fix my mistake (forgot to remove a getch2_enable) but in the rigth
albeu
parents:
4834
diff
changeset
|
2681 // 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
|
2682 // or cache filling |
12816 | 2683 if(!noconsolecontrols && !slave_mode){ |
5983 | 2684 if(inited_flags&INITED_GETCH2) |
13577 | 2685 mp_msg(MSGT_CPLAYER,MSGL_WARN,MSGTR_Getch2InitializedTwice); |
5983 | 2686 else |
2687 getch2_enable(); // prepare stdin for hotkeys... | |
4835
1f59d4d73558
Fix my mistake (forgot to remove a getch2_enable) but in the rigth
albeu
parents:
4834
diff
changeset
|
2688 inited_flags|=INITED_GETCH2; |
5154 | 2689 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
|
2690 } |
4825
41d2da3bd082
Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents:
4818
diff
changeset
|
2691 |
5983 | 2692 // =================== GUI idle loop (STOP state) =========================== |
1745 | 2693 #ifdef HAVE_NEW_GUI |
1787
de6a0987a08d
stop fixed, fileselector supp. maybe not work, couldn't test
arpi
parents:
1772
diff
changeset
|
2694 if ( use_gui ) { |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
2695 mpctx->file_format=DEMUXER_TYPE_UNKNOWN; |
8423 | 2696 guiGetEvent( guiSetDefaults,0 ); |
5665 | 2697 while ( guiIntfStruct.Playing != 1 ) |
2698 { | |
4858 | 2699 mp_cmd_t* cmd; |
9464 | 2700 usec_sleep(20000); |
4798 | 2701 guiEventHandling(); |
6619
f554e7271587
fix volume handling ( step 2 ) -- add balance support and some code cleanup and fix
pontscho
parents:
6590
diff
changeset
|
2702 guiGetEvent( guiReDraw,NULL ); |
13603 | 2703 if ( (cmd = mp_input_get_cmd(0,0,0)) != NULL) guiGetEvent( guiIEvent,(char *)cmd->id ); |
5665 | 2704 } |
8423 | 2705 guiGetEvent( guiSetParameters,NULL ); |
2706 if ( guiIntfStruct.StreamType == STREAMTYPE_STREAM ) | |
3543 | 2707 { |
4950 | 2708 play_tree_t * entry = play_tree_new(); |
2709 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
|
2710 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
|
2711 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
|
2712 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
|
2713 if(mpctx->playtree) |
4950 | 2714 { |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
2715 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
|
2716 if(mpctx->playtree_iter) |
4950 | 2717 { |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
2718 if(play_tree_iter_step(mpctx->playtree_iter,0,0) != PLAY_TREE_ITER_ENTRY) |
4950 | 2719 { |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
2720 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
|
2721 mpctx->playtree_iter = NULL; |
4950 | 2722 } |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
2723 filename = play_tree_iter_get_file(mpctx->playtree_iter,1); |
4950 | 2724 } |
2725 } | |
4974 | 2726 } |
1787
de6a0987a08d
stop fixed, fileselector supp. maybe not work, couldn't test
arpi
parents:
1772
diff
changeset
|
2727 } |
16490
f17b3c152fd6
Add comments to a few #endif statements in order to make clear which
diego
parents:
16489
diff
changeset
|
2728 #endif /* HAVE_NEW_GUI */ |
16347
da2926d990ce
Adds -idle, an option to make MPlayer wait for input ('loadfile' or
ods15
parents:
16346
diff
changeset
|
2729 |
da2926d990ce
Adds -idle, an option to make MPlayer wait for input ('loadfile' or
ods15
parents:
16346
diff
changeset
|
2730 while (player_idle_mode && !filename) { |
da2926d990ce
Adds -idle, an option to make MPlayer wait for input ('loadfile' or
ods15
parents:
16346
diff
changeset
|
2731 play_tree_t * entry = NULL; |
da2926d990ce
Adds -idle, an option to make MPlayer wait for input ('loadfile' or
ods15
parents:
16346
diff
changeset
|
2732 mp_cmd_t * cmd; |
da2926d990ce
Adds -idle, an option to make MPlayer wait for input ('loadfile' or
ods15
parents:
16346
diff
changeset
|
2733 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
|
2734 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
|
2735 usec_sleep(20000); |
da2926d990ce
Adds -idle, an option to make MPlayer wait for input ('loadfile' or
ods15
parents:
16346
diff
changeset
|
2736 } |
da2926d990ce
Adds -idle, an option to make MPlayer wait for input ('loadfile' or
ods15
parents:
16346
diff
changeset
|
2737 switch (cmd->id) { |
da2926d990ce
Adds -idle, an option to make MPlayer wait for input ('loadfile' or
ods15
parents:
16346
diff
changeset
|
2738 case MP_CMD_LOADFILE: |
da2926d990ce
Adds -idle, an option to make MPlayer wait for input ('loadfile' or
ods15
parents:
16346
diff
changeset
|
2739 // 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
|
2740 entry = play_tree_new(); |
da2926d990ce
Adds -idle, an option to make MPlayer wait for input ('loadfile' or
ods15
parents:
16346
diff
changeset
|
2741 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
|
2742 // 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
|
2743 break; |
da2926d990ce
Adds -idle, an option to make MPlayer wait for input ('loadfile' or
ods15
parents:
16346
diff
changeset
|
2744 case MP_CMD_LOADLIST: |
da2926d990ce
Adds -idle, an option to make MPlayer wait for input ('loadfile' or
ods15
parents:
16346
diff
changeset
|
2745 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
|
2746 break; |
da2926d990ce
Adds -idle, an option to make MPlayer wait for input ('loadfile' or
ods15
parents:
16346
diff
changeset
|
2747 case MP_CMD_QUIT: |
da2926d990ce
Adds -idle, an option to make MPlayer wait for input ('loadfile' or
ods15
parents:
16346
diff
changeset
|
2748 exit_player_with_rc(MSGTR_Exit_quit, (cmd->nargs > 0)? cmd->args[0].v.i : 0); |
da2926d990ce
Adds -idle, an option to make MPlayer wait for input ('loadfile' or
ods15
parents:
16346
diff
changeset
|
2749 break; |
da2926d990ce
Adds -idle, an option to make MPlayer wait for input ('loadfile' or
ods15
parents:
16346
diff
changeset
|
2750 } |
da2926d990ce
Adds -idle, an option to make MPlayer wait for input ('loadfile' or
ods15
parents:
16346
diff
changeset
|
2751 |
da2926d990ce
Adds -idle, an option to make MPlayer wait for input ('loadfile' or
ods15
parents:
16346
diff
changeset
|
2752 mp_cmd_free(cmd); |
da2926d990ce
Adds -idle, an option to make MPlayer wait for input ('loadfile' or
ods15
parents:
16346
diff
changeset
|
2753 |
da2926d990ce
Adds -idle, an option to make MPlayer wait for input ('loadfile' or
ods15
parents:
16346
diff
changeset
|
2754 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
|
2755 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
|
2756 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
|
2757 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
|
2758 |
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
2759 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
|
2760 |
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
2761 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
|
2762 |
18316
b3be7df634b0
spelling/grammar/wording fixes in doxygen and non-doxygen comments
diego
parents:
18315
diff
changeset
|
2763 /* 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
|
2764 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
|
2765 if (!mpctx->playtree_iter) continue; |
16347
da2926d990ce
Adds -idle, an option to make MPlayer wait for input ('loadfile' or
ods15
parents:
16346
diff
changeset
|
2766 |
da2926d990ce
Adds -idle, an option to make MPlayer wait for input ('loadfile' or
ods15
parents:
16346
diff
changeset
|
2767 // 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
|
2768 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
|
2769 // no items! |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
2770 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
|
2771 mpctx->playtree_iter = NULL; |
16347
da2926d990ce
Adds -idle, an option to make MPlayer wait for input ('loadfile' or
ods15
parents:
16346
diff
changeset
|
2772 continue; // wait for next command |
da2926d990ce
Adds -idle, an option to make MPlayer wait for input ('loadfile' or
ods15
parents:
16346
diff
changeset
|
2773 } |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
2774 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
|
2775 } |
da2926d990ce
Adds -idle, an option to make MPlayer wait for input ('loadfile' or
ods15
parents:
16346
diff
changeset
|
2776 } |
5983 | 2777 //--------------------------------------------------------------------------- |
1787
de6a0987a08d
stop fixed, fileselector supp. maybe not work, couldn't test
arpi
parents:
1772
diff
changeset
|
2778 |
22002
ebd2d5efb11b
filename double-conversion, especially usefull for CJK users :-)
gpoirier
parents:
21930
diff
changeset
|
2779 if(filename) |
ebd2d5efb11b
filename double-conversion, especially usefull for CJK users :-)
gpoirier
parents:
21930
diff
changeset
|
2780 mp_msg(MSGT_CPLAYER,MSGL_INFO,MSGTR_Playing, |
ebd2d5efb11b
filename double-conversion, especially usefull for CJK users :-)
gpoirier
parents:
21930
diff
changeset
|
2781 filename_recode(filename)); |
1650
7502b16bce63
make automatic subfile detection working with many files
atlka
parents:
1641
diff
changeset
|
2782 |
17109
327be31a101d
Fix EDL to be per file, allow -edlout and -edl together as there is really
ods15
parents:
17106
diff
changeset
|
2783 if (edl_filename) { |
327be31a101d
Fix EDL to be per file, allow -edlout and -edl together as there is really
ods15
parents:
17106
diff
changeset
|
2784 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
|
2785 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
|
2786 } |
327be31a101d
Fix EDL to be per file, allow -edlout and -edl together as there is really
ods15
parents:
17106
diff
changeset
|
2787 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
|
2788 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
|
2789 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
|
2790 { |
327be31a101d
Fix EDL to be per file, allow -edlout and -edl together as there is really
ods15
parents:
17106
diff
changeset
|
2791 mp_msg(MSGT_CPLAYER, MSGL_ERR, MSGTR_EdlCantOpenForWrite, |
22002
ebd2d5efb11b
filename double-conversion, especially usefull for CJK users :-)
gpoirier
parents:
21930
diff
changeset
|
2792 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
|
2793 } |
327be31a101d
Fix EDL to be per file, allow -edlout and -edl together as there is really
ods15
parents:
17106
diff
changeset
|
2794 } |
327be31a101d
Fix EDL to be per file, allow -edlout and -edl together as there is really
ods15
parents:
17106
diff
changeset
|
2795 |
5983 | 2796 //==================== Open VOB-Sub ============================ |
2797 | |
4770
59f8fd64538b
autodetect vobsub filename, disable autosub if vobsub found.
atmos4
parents:
4754
diff
changeset
|
2798 current_module="vobsub"; |
59f8fd64538b
autodetect vobsub filename, disable autosub if vobsub found.
atmos4
parents:
4754
diff
changeset
|
2799 if (vobsub_name){ |
6110 | 2800 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
|
2801 if(vo_vobsub==NULL) |
22002
ebd2d5efb11b
filename double-conversion, especially usefull for CJK users :-)
gpoirier
parents:
21930
diff
changeset
|
2802 mp_msg(MSGT_CPLAYER,MSGL_ERR,MSGTR_CantLoadSub, |
ebd2d5efb11b
filename double-conversion, especially usefull for CJK users :-)
gpoirier
parents:
21930
diff
changeset
|
2803 filename_recode(vobsub_name)); |
4770
59f8fd64538b
autodetect vobsub filename, disable autosub if vobsub found.
atmos4
parents:
4754
diff
changeset
|
2804 }else if(sub_auto && filename && (strlen(filename)>=5)){ |
59f8fd64538b
autodetect vobsub filename, disable autosub if vobsub found.
atmos4
parents:
4754
diff
changeset
|
2805 /* try to autodetect vobsub from movie filename ::atmos */ |
18857 | 2806 char *buf = malloc((strlen(filename)-3)),*psub; |
4770
59f8fd64538b
autodetect vobsub filename, disable autosub if vobsub found.
atmos4
parents:
4754
diff
changeset
|
2807 memset(buf,0,strlen(filename)-3); // make sure string is terminated |
59f8fd64538b
autodetect vobsub filename, disable autosub if vobsub found.
atmos4
parents:
4754
diff
changeset
|
2808 strncpy(buf, filename, strlen(filename)-4); |
6110 | 2809 vo_vobsub=vobsub_open(buf,spudec_ifo,0,&vo_spudec); |
16897 | 2810 /* try from ~/.mplayer/sub */ |
2811 if(!vo_vobsub && (psub = get_path( "sub/" ))) { | |
2812 char *bname; | |
2813 int l; | |
2814 bname = strrchr(buf,'/'); | |
2815 #ifdef WIN32 | |
2816 if(!bname) bname = strrchr(buf,'\\'); | |
2817 #endif | |
2818 if(bname) bname++; | |
2819 else bname = buf; | |
2820 l = strlen(psub) + strlen(bname) + 1; | |
2821 psub = realloc(psub,l); | |
2822 strcat(psub,bname); | |
2823 vo_vobsub=vobsub_open(psub,spudec_ifo,0,&vo_spudec); | |
2824 free(psub); | |
2825 } | |
4770
59f8fd64538b
autodetect vobsub filename, disable autosub if vobsub found.
atmos4
parents:
4754
diff
changeset
|
2826 free(buf); |
59f8fd64538b
autodetect vobsub filename, disable autosub if vobsub found.
atmos4
parents:
4754
diff
changeset
|
2827 } |
7621
7caeb275ad26
uninit cleanup again... thx to Nilmoni Deb for bugreport
arpi
parents:
7614
diff
changeset
|
2828 if(vo_vobsub){ |
7caeb275ad26
uninit cleanup again... thx to Nilmoni Deb for bugreport
arpi
parents:
7614
diff
changeset
|
2829 inited_flags|=INITED_VOBSUB; |
8535
bc7bd163fff9
Here is the patch to make vobsub subtitle use -slang option, I have not made a
arpi
parents:
8534
diff
changeset
|
2830 vobsub_set_from_lang(vo_vobsub, dvdsub_lang); |
10917
d45870f67728
Forced subtitles patch by Arne Driescher <driescher@mpi-magdeburg.mpg.de>
attila
parents:
10884
diff
changeset
|
2831 // check if vobsub requested only to display forced subtitles |
d45870f67728
Forced subtitles patch by Arne Driescher <driescher@mpi-magdeburg.mpg.de>
attila
parents:
10884
diff
changeset
|
2832 forced_subs_only=vobsub_get_forced_subs_flag(vo_vobsub); |
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
|
2833 |
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
|
2834 // setup global sub numbering |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
2835 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
|
2836 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
|
2837 } |
4770
59f8fd64538b
autodetect vobsub filename, disable autosub if vobsub found.
atmos4
parents:
4754
diff
changeset
|
2838 |
5151 | 2839 //============ Open & Sync STREAM --- fork cache2 ==================== |
2840 | |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
2841 mpctx->stream=NULL; |
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
2842 mpctx->demuxer=NULL; |
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
2843 if (mpctx->d_audio) { |
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
2844 //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
|
2845 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
|
2846 } |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
2847 if (mpctx->d_video) { |
10997
2f7c74ce8c9a
1000l to pl, this made mplayer crash when playing playlists longer
rfelker
parents:
10959
diff
changeset
|
2848 //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
|
2849 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
|
2850 } |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
2851 mpctx->sh_audio=NULL; |
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
2852 mpctx->sh_video=NULL; |
5983 | 2853 |
1639 | 2854 current_module="open_stream"; |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
2855 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
|
2856 if(!mpctx->stream) { // error... |
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
2857 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
|
2858 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
|
2859 } |
2321 | 2860 inited_flags|=INITED_STREAM; |
5151 | 2861 |
8423 | 2862 #ifdef HAVE_NEW_GUI |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
2863 if ( use_gui ) guiGetEvent( guiSetStream,(char *)mpctx->stream ); |
8423 | 2864 #endif |
2865 | |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
2866 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
|
2867 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
|
2868 // Handle playlist |
5151 | 2869 current_module="handle_playlist"; |
22002
ebd2d5efb11b
filename double-conversion, especially usefull for CJK users :-)
gpoirier
parents:
21930
diff
changeset
|
2870 mp_msg(MSGT_CPLAYER,MSGL_V,"Parsing playlist %s...\n", |
ebd2d5efb11b
filename double-conversion, especially usefull for CJK users :-)
gpoirier
parents:
21930
diff
changeset
|
2871 filename_recode(filename)); |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
2872 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
|
2873 mpctx->eof=playtree_add_playlist(entry); |
4825
41d2da3bd082
Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents:
4818
diff
changeset
|
2874 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
|
2875 } |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
2876 mpctx->stream->start_pos+=seek_to_byte; |
598 | 2877 |
3257 | 2878 if(stream_dump_type==5){ |
2879 unsigned char buf[4096]; | |
2880 int len; | |
2881 FILE *f; | |
5151 | 2882 current_module="dumpstream"; |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
2883 if(mpctx->stream->type==STREAMTYPE_STREAM && mpctx->stream->fd<0){ |
13577 | 2884 mp_msg(MSGT_CPLAYER,MSGL_FATAL,MSGTR_DumpstreamFdUnavailable); |
7204 | 2885 exit_player(MSGTR_Exit_error); |
2886 } | |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
2887 stream_reset(mpctx->stream); |
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
2888 stream_seek(mpctx->stream,mpctx->stream->start_pos); |
3257 | 2889 f=fopen(stream_dump_name,"wb"); |
2890 if(!f){ | |
2891 mp_msg(MSGT_CPLAYER,MSGL_FATAL,MSGTR_CantOpenDumpfile); | |
2892 exit_player(MSGTR_Exit_error); | |
2893 } | |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
2894 while(!mpctx->stream->eof){ |
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
2895 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
|
2896 if(len>0) { |
785c945f6796
check for -dumpstream file writes, patch by Eric Lammerts <eric@lammerts.org>
alex
parents:
10223
diff
changeset
|
2897 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
|
2898 mp_msg(MSGT_MENCODER,MSGL_FATAL,MSGTR_ErrorWritingFile,stream_dump_name); |
785c945f6796
check for -dumpstream file writes, patch by Eric Lammerts <eric@lammerts.org>
alex
parents:
10223
diff
changeset
|
2899 exit_player(MSGTR_Exit_error); |
785c945f6796
check for -dumpstream file writes, patch by Eric Lammerts <eric@lammerts.org>
alex
parents:
10223
diff
changeset
|
2900 } |
785c945f6796
check for -dumpstream file writes, patch by Eric Lammerts <eric@lammerts.org>
alex
parents:
10223
diff
changeset
|
2901 } |
3257 | 2902 } |
10225
785c945f6796
check for -dumpstream file writes, patch by Eric Lammerts <eric@lammerts.org>
alex
parents:
10223
diff
changeset
|
2903 if(fclose(f)) { |
785c945f6796
check for -dumpstream file writes, patch by Eric Lammerts <eric@lammerts.org>
alex
parents:
10223
diff
changeset
|
2904 mp_msg(MSGT_MENCODER,MSGL_FATAL,MSGTR_ErrorWritingFile,stream_dump_name); |
785c945f6796
check for -dumpstream file writes, patch by Eric Lammerts <eric@lammerts.org>
alex
parents:
10223
diff
changeset
|
2905 exit_player(MSGTR_Exit_error); |
785c945f6796
check for -dumpstream file writes, patch by Eric Lammerts <eric@lammerts.org>
alex
parents:
10223
diff
changeset
|
2906 } |
3257 | 2907 mp_msg(MSGT_CPLAYER,MSGL_INFO,MSGTR_CoreDumped); |
8644
0bfd73828e33
This patch fixes so that the exit code (or return code if you like) is set
arpi
parents:
8635
diff
changeset
|
2908 exit_player_with_rc(MSGTR_Exit_eof, 0); |
3257 | 2909 } |
2910 | |
4274 | 2911 #ifdef USE_DVDREAD |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
2912 if(mpctx->stream->type==STREAMTYPE_DVD){ |
5425 | 2913 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
|
2914 if(audio_id==-1) audio_id=dvd_aid_from_lang(mpctx->stream,audio_lang); |
17379
9d99333ce6ab
dvd subtitles should be disabled by default, and enabled specifying -sid or -slang; this fix also restores the display of other subtitles types when dvd subs are present
nicodvb
parents:
17366
diff
changeset
|
2915 if(dvdsub_lang && dvdsub_id==-2) dvdsub_id=-1; |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
2916 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
|
2917 // setup global sub numbering |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
2918 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
|
2919 mpctx->global_sub_size += dvd_number_of_subs(mpctx->stream); |
5425 | 2920 current_module=NULL; |
2921 } | |
4274 | 2922 #endif |
2923 | |
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
|
2924 #ifdef USE_DVDNAV |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
2925 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
|
2926 current_module="dvdnav lang->id"; |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
2927 if(audio_id==-1) audio_id=dvdnav_aid_from_lang(mpctx->stream,audio_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
|
2928 if(dvdsub_lang && dvdsub_id==-2) dvdsub_id=-1; |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
2929 if(dvdsub_lang && dvdsub_id==-1) dvdsub_id=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
|
2930 // setup global sub numbering |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
2931 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
|
2932 mpctx->global_sub_size += 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
|
2933 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
|
2934 } |
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
|
2935 #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
|
2936 |
5151 | 2937 // CACHE2: initial prefill: 20% later: 5% (should be set by -cacheopts) |
11352 | 2938 goto_enable_cache: |
7881
aba9301ed3c4
allow cache to be disabled (-nocache should override cachesize autodetection
arpi
parents:
7867
diff
changeset
|
2939 if(stream_cache_size>0){ |
5151 | 2940 current_module="enable_cache"; |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
2941 if(!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
|
2942 stream_cache_size*1024*(stream_cache_min_percent / 100.0), |
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
|
2943 stream_cache_size*1024*(stream_cache_seek_min_percent / 100.0))) |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
2944 if((mpctx->eof = libmpdemux_was_interrupted(PT_NEXT_ENTRY))) goto goto_next_file; |
5151 | 2945 } |
1639 | 2946 |
5151 | 2947 //============ Open DEMUXERS --- DETECT file type ======================= |
1639 | 2948 current_module="demux_open"; |
2949 | |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
2950 mpctx->demuxer=demux_open(mpctx->stream,mpctx->file_format,audio_id,video_id,dvdsub_id,filename); |
8937 | 2951 |
2952 // HACK to get MOV Reference Files working | |
2953 | |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
2954 if (mpctx->demuxer && mpctx->demuxer->type==DEMUXER_TYPE_PLAYLIST) |
8937 | 2955 { |
2956 unsigned char* playlist_entry; | |
2957 play_tree_t *list = NULL, *entry = NULL; | |
2958 | |
2959 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
|
2960 while (ds_get_packet(mpctx->demuxer->video,&playlist_entry)>0) |
8937 | 2961 { |
2962 char *temp, *bname; | |
2963 | |
22002
ebd2d5efb11b
filename double-conversion, especially usefull for CJK users :-)
gpoirier
parents:
21930
diff
changeset
|
2964 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
|
2965 filename_recode(playlist_entry)); |
8937 | 2966 |
2967 bname=mp_basename(playlist_entry); | |
2968 if ((strlen(bname)>10) && !strncmp(bname,"qt",2) && !strncmp(bname+3,"gateQT",6)) | |
2969 continue; | |
2970 | |
9124
ff773800b598
I also added that a self-reference is not endlessly played ... (Happened
arpi
parents:
9105
diff
changeset
|
2971 if (!strncmp(bname,mp_basename(filename),strlen(bname))) // ignoring self-reference |
ff773800b598
I also added that a self-reference is not endlessly played ... (Happened
arpi
parents:
9105
diff
changeset
|
2972 continue; |
ff773800b598
I also added that a self-reference is not endlessly played ... (Happened
arpi
parents:
9105
diff
changeset
|
2973 |
8937 | 2974 entry = play_tree_new(); |
2975 | |
2976 if (filename && !strcmp(mp_basename(playlist_entry),playlist_entry)) // add reference path of current file | |
2977 { | |
18857 | 2978 temp=malloc((strlen(filename)-strlen(mp_basename(filename))+strlen(playlist_entry)+1)); |
8937 | 2979 if (temp) |
2980 { | |
2981 strncpy(temp, filename, strlen(filename)-strlen(mp_basename(filename))); | |
2982 temp[strlen(filename)-strlen(mp_basename(filename))]='\0'; | |
2983 strcat(temp, playlist_entry); | |
2984 play_tree_add_file(entry,temp); | |
13577 | 2985 mp_msg(MSGT_CPLAYER,MSGL_V,"Resolving reference to %s.\n",temp); |
8937 | 2986 free(temp); |
2987 } | |
2988 } | |
2989 else | |
2990 play_tree_add_file(entry,playlist_entry); | |
2991 | |
2992 if(!list) | |
2993 list = entry; | |
2994 else | |
2995 play_tree_append_entry(list,entry); | |
2996 } | |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
2997 free_demuxer(mpctx->demuxer); |
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
2998 mpctx->demuxer = NULL; |
8937 | 2999 |
3000 if (list) | |
3001 { | |
3002 entry = play_tree_new(); | |
3003 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
|
3004 mpctx->eof=playtree_add_playlist(entry); |
8937 | 3005 goto goto_next_file; |
3006 } | |
3007 } | |
3008 | |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
3009 if(!mpctx->demuxer) |
8925
5c15777f1c07
this patch adds an fallback to playlist (any but the plaintext-list format)
arpi
parents:
8913
diff
changeset
|
3010 goto goto_next_file; |
7058
2e5c07262861
new v4l capture patch by Jindrich Makovicka <makovick@kmlinux.fjfi.cvut.cz>:
arpi
parents:
7055
diff
changeset
|
3011 inited_flags|=INITED_DEMUXER; |
2e5c07262861
new v4l capture patch by Jindrich Makovicka <makovick@kmlinux.fjfi.cvut.cz>:
arpi
parents:
7055
diff
changeset
|
3012 |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
3013 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
|
3014 int i; |
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
|
3015 // setup global sub numbering |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
3016 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
|
3017 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
|
3018 if (mpctx->demuxer->s_streams[i]) |
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
3019 mpctx->global_sub_size++; |
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
|
3020 } |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
3021 if (mpctx->global_sub_size <= dvdsub_id) mpctx->global_sub_size = 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
|
3022 |
5175
8354d89498d4
video codec selection redesigned and moved to libmpcodecs - now it's 'intelligent'
arpi
parents:
5154
diff
changeset
|
3023 current_module="demux_open2"; |
8354d89498d4
video codec selection redesigned and moved to libmpcodecs - now it's 'intelligent'
arpi
parents:
5154
diff
changeset
|
3024 |
1660 | 3025 //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
|
3026 |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
3027 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
|
3028 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
|
3029 mpctx->d_sub=mpctx->demuxer->sub; |
1 | 3030 |
792 | 3031 // DUMP STREAMS: |
6209 | 3032 if((stream_dump_type)&&(stream_dump_type<4)){ |
792 | 3033 FILE *f; |
3034 demux_stream_t *ds=NULL; | |
1639 | 3035 current_module="dump"; |
792 | 3036 // select stream to dump |
3037 switch(stream_dump_type){ | |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
3038 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
|
3039 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
|
3040 case 3: ds=mpctx->d_sub;break; |
792 | 3041 } |
3042 if(!ds){ | |
7805 | 3043 mp_msg(MSGT_CPLAYER,MSGL_FATAL,MSGTR_DumpSelectedStreamMissing); |
1639 | 3044 exit_player(MSGTR_Exit_error); |
792 | 3045 } |
3046 // disable other streams: | |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
3047 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
|
3048 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
|
3049 if(mpctx->d_sub && mpctx->d_sub!=ds) {ds_free_packs(mpctx->d_sub); mpctx->d_sub->id=-2; } |
792 | 3050 // let's dump it! |
3257 | 3051 f=fopen(stream_dump_name,"wb"); |
1639 | 3052 if(!f){ |
3053 mp_msg(MSGT_CPLAYER,MSGL_FATAL,MSGTR_CantOpenDumpfile); | |
3054 exit_player(MSGTR_Exit_error); | |
3055 } | |
792 | 3056 while(!ds->eof){ |
3057 unsigned char* start; | |
3058 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
|
3059 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
|
3060 && stream_dump_type==2) fwrite(&in_size,1,4,f); |
792 | 3061 if(in_size>0) fwrite(start,in_size,1,f); |
3062 } | |
3063 fclose(f); | |
1582 | 3064 mp_msg(MSGT_CPLAYER,MSGL_INFO,MSGTR_CoreDumped); |
8644
0bfd73828e33
This patch fixes so that the exit code (or return code if you like) is set
arpi
parents:
8635
diff
changeset
|
3065 exit_player_with_rc(MSGTR_Exit_eof, 0); |
792 | 3066 } |
3067 | |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
3068 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
|
3069 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
|
3070 |
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
3071 if(mpctx->sh_video){ |
1 | 3072 |
5151 | 3073 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
|
3074 if(!video_read_properties(mpctx->sh_video)) { |
7805 | 3075 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
|
3076 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
|
3077 } else { |
6138
523014df7d32
big cosmetics patch, cleanup of messages printed by mplayer and libs.
arpi
parents:
6135
diff
changeset
|
3078 mp_msg(MSGT_CPLAYER,MSGL_V,"[V] filefmt:%d fourcc:0x%X size:%dx%d fps:%5.2f ftime:=%6.4f\n", |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
3079 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
|
3080 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
|
3081 ); |
1 | 3082 |
4598 | 3083 /* need to set fps here for output encoders to pick it up in their init */ |
3084 if(force_fps){ | |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
3085 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
|
3086 mpctx->sh_video->frametime=1.0f/mpctx->sh_video->fps; |
4598 | 3087 } |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
3088 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
|
3089 |
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
3090 if(!mpctx->sh_video->fps && !force_fps){ |
4587
886bf5274992
Audio only support. Include a fix in the asf demuxer opening.
albeu
parents:
4552
diff
changeset
|
3091 mp_msg(MSGT_CPLAYER,MSGL_ERR,MSGTR_FPSnotspecified); |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
3092 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
|
3093 } |
1375
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1369
diff
changeset
|
3094 } |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1369
diff
changeset
|
3095 |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1369
diff
changeset
|
3096 } |
398 | 3097 |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
3098 if(!mpctx->sh_video && !mpctx->sh_audio){ |
6930 | 3099 mp_msg(MSGT_CPLAYER,MSGL_FATAL, MSGTR_NoStreamFound); |
10708 | 3100 #ifdef HAS_DVBIN_SUPPORT |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
3101 if((mpctx->stream->type == STREAMTYPE_DVB) && mpctx->stream->priv) |
10708 | 3102 { |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
3103 dvb_priv_t *priv = (dvb_priv_t*) mpctx->stream->priv; |
10708 | 3104 if(priv->is_on) |
3105 { | |
3106 int dir; | |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
3107 int v = mpctx->last_dvb_step; |
10708 | 3108 if(v > 0) |
3109 dir = DVB_CHANNEL_HIGHER; | |
3110 else | |
3111 dir = DVB_CHANNEL_LOWER; | |
3112 | |
3113 if(dvb_step_channel(priv, dir)) | |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
3114 mpctx->eof = mpctx->dvbin_reopen = 1; |
10708 | 3115 } |
3116 } | |
3117 #endif | |
1641
b7dae998505c
free stream/demuxer. continue playback with next file if error found
arpi
parents:
1639
diff
changeset
|
3118 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
|
3119 } |
13c0dfde813b
removed dummy audio track for -nosound, vo: flip detection
arpi_esp
parents:
766
diff
changeset
|
3120 |
5151 | 3121 /* display clip info */ |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
3122 demux_info_print(mpctx->demuxer); |
5151 | 3123 |
3124 //================== Read SUBTITLES (DVD & TEXT) ========================== | |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
3125 if(vo_spudec==NULL && mpctx->sh_video && |
23573 | 3126 (mpctx->stream->type==STREAMTYPE_DVD || mpctx->stream->type == STREAMTYPE_DVDNAV || mpctx->d_sub->id >= 0)){ |
21119
5f9009952814
Move vo_spudec initialization into a separate function, for later reuse
reimar
parents:
21082
diff
changeset
|
3127 init_vo_spudec(); |
6110 | 3128 } |
3129 | |
10917
d45870f67728
Forced subtitles patch by Arne Driescher <driescher@mpi-magdeburg.mpg.de>
attila
parents:
10884
diff
changeset
|
3130 // Apply current settings for forced subs |
d45870f67728
Forced subtitles patch by Arne Driescher <driescher@mpi-magdeburg.mpg.de>
attila
parents:
10884
diff
changeset
|
3131 if (vo_spudec!=NULL) |
d45870f67728
Forced subtitles patch by Arne Driescher <driescher@mpi-magdeburg.mpg.de>
attila
parents:
10884
diff
changeset
|
3132 spudec_set_forced_subs_only(vo_spudec,forced_subs_only); |
d45870f67728
Forced subtitles patch by Arne Driescher <driescher@mpi-magdeburg.mpg.de>
attila
parents:
10884
diff
changeset
|
3133 |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
3134 if(mpctx->sh_video) { |
4064
3c747168eb6e
1. subs know are readed after reading AVI header so we already know fps
atlka
parents:
4052
diff
changeset
|
3135 // 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
|
3136 // 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
|
3137 // check .sub |
5151 | 3138 current_module="read_subtitles_file"; |
3139 if(sub_name){ | |
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9831
diff
changeset
|
3140 for (i = 0; sub_name[i] != NULL; ++i) |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
3141 add_subtitles (sub_name[i], mpctx->sh_video->fps, 0); |
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9831
diff
changeset
|
3142 } |
5151 | 3143 if(sub_auto) { // auto load sub file ... |
11767 | 3144 char *psub = get_path( "sub/" ); |
3145 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
|
3146 int i = 0; |
12890 | 3147 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
|
3148 while (tmp[i]) { |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
3149 add_subtitles (tmp[i], mpctx->sh_video->fps, 0); |
15603
2d1ad16b6021
strdup subtitle filename at a more appropriate place, fixing memleaks and
reimar
parents:
15584
diff
changeset
|
3150 free(tmp[i++]); |
2d1ad16b6021
strdup subtitle filename at a more appropriate place, fixing memleaks and
reimar
parents:
15584
diff
changeset
|
3151 } |
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9831
diff
changeset
|
3152 free(tmp); |
4064
3c747168eb6e
1. subs know are readed after reading AVI header so we already know fps
atlka
parents:
4052
diff
changeset
|
3153 } |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
3154 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
|
3155 // setup global sub numbering |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
3156 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
|
3157 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
|
3158 } |
5151 | 3159 } |
6110 | 3160 |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
3161 if (mpctx->global_sub_size) { |
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
|
3162 // find the best sub to use |
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
|
3163 if (vobsub_id >= 0) { |
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
|
3164 // if user asks for a vobsub id, use that first. |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
3165 mpctx->global_sub_pos = mpctx->global_sub_indices[SUB_SOURCE_VOBSUB] + vobsub_id; |
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
3166 } else if (dvdsub_id >= 0 && mpctx->global_sub_indices[SUB_SOURCE_DEMUX] >= 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
|
3167 // if user asks for a dvd sub id, use that next. |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
3168 mpctx->global_sub_pos = mpctx->global_sub_indices[SUB_SOURCE_DEMUX] + dvdsub_id; |
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
3169 } else if (mpctx->global_sub_indices[SUB_SOURCE_SUBS] >= 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
|
3170 // if there are text subs to use, use those. (autosubs come last here) |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
3171 mpctx->global_sub_pos = mpctx->global_sub_indices[SUB_SOURCE_SUBS]; |
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
|
3172 /* |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
3173 } else if (mpctx->global_sub_indices[SUB_SOURCE_DEMUX] >= 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
|
3174 // if nothing else works, get subs from the demuxer. |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
3175 mpctx->global_sub_pos = mpctx->global_sub_indices[SUB_SOURCE_DEMUX]; |
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
|
3176 */ |
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
|
3177 } else { |
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
|
3178 // nothing worth doing automatically. |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
3179 mpctx->global_sub_pos = -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
|
3180 } |
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
|
3181 // rather than duplicate code, use the SUB_SELECT handler to init the right one. |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
3182 mpctx->global_sub_pos--; |
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
3183 mp_property_do("sub",M_PROPERTY_STEP_UP,NULL, mpctx); |
17935
d72e7330c548
Subtitles properties: move sub_select, sub_pos, sub_visibilty,
albeu
parents:
17932
diff
changeset
|
3184 if(subdata) |
d72e7330c548
Subtitles properties: move sub_select, sub_pos, sub_visibilty,
albeu
parents:
17932
diff
changeset
|
3185 switch (stream_dump_type) { |
d72e7330c548
Subtitles properties: move sub_select, sub_pos, sub_visibilty,
albeu
parents:
17932
diff
changeset
|
3186 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
|
3187 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
|
3188 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
|
3189 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
|
3190 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
|
3191 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
|
3192 } |
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
|
3193 } |
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
|
3194 |
22002
ebd2d5efb11b
filename double-conversion, especially usefull for CJK users :-)
gpoirier
parents:
21930
diff
changeset
|
3195 mp_msg(MSGT_IDENTIFY,MSGL_INFO,"ID_FILENAME=%s\n", |
ebd2d5efb11b
filename double-conversion, especially usefull for CJK users :-)
gpoirier
parents:
21930
diff
changeset
|
3196 filename_recode(filename)); |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
3197 mp_msg(MSGT_IDENTIFY,MSGL_INFO,"ID_DEMUXER=%s\n", mpctx->demuxer->desc->name); |
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
3198 if (mpctx->sh_video) { |
7864 | 3199 /* Assume FOURCC if all bytes >= 0x20 (' ') */ |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
3200 if (mpctx->sh_video->format >= 0x20202020) |
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
3201 mp_msg(MSGT_IDENTIFY,MSGL_INFO,"ID_VIDEO_FORMAT=%.4s\n", (char *)&mpctx->sh_video->format); |
7864 | 3202 else |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
3203 mp_msg(MSGT_IDENTIFY,MSGL_INFO,"ID_VIDEO_FORMAT=0x%08X\n", mpctx->sh_video->format); |
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
3204 mp_msg(MSGT_IDENTIFY,MSGL_INFO,"ID_VIDEO_BITRATE=%d\n", mpctx->sh_video->i_bps*8); |
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
3205 mp_msg(MSGT_IDENTIFY,MSGL_INFO,"ID_VIDEO_WIDTH=%d\n", mpctx->sh_video->disp_w); |
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
3206 mp_msg(MSGT_IDENTIFY,MSGL_INFO,"ID_VIDEO_HEIGHT=%d\n", mpctx->sh_video->disp_h); |
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
3207 mp_msg(MSGT_IDENTIFY,MSGL_INFO,"ID_VIDEO_FPS=%5.3f\n", mpctx->sh_video->fps); |
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
3208 mp_msg(MSGT_IDENTIFY,MSGL_INFO,"ID_VIDEO_ASPECT=%1.4f\n", mpctx->sh_video->aspect); |
7864 | 3209 } |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
3210 if (mpctx->sh_audio) { |
7864 | 3211 /* Assume FOURCC if all bytes >= 0x20 (' ') */ |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
3212 if (mpctx->sh_audio->format >= 0x20202020) |
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
3213 mp_msg(MSGT_IDENTIFY,MSGL_INFO, "ID_AUDIO_FORMAT=%.4s\n", (char *)&mpctx->sh_audio->format); |
7864 | 3214 else |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
3215 mp_msg(MSGT_IDENTIFY,MSGL_INFO,"ID_AUDIO_FORMAT=%d\n", mpctx->sh_audio->format); |
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
3216 mp_msg(MSGT_IDENTIFY,MSGL_INFO,"ID_AUDIO_BITRATE=%d\n", mpctx->sh_audio->i_bps*8); |
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
3217 mp_msg(MSGT_IDENTIFY,MSGL_INFO,"ID_AUDIO_RATE=%d\n", mpctx->sh_audio->samplerate); |
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
3218 mp_msg(MSGT_IDENTIFY,MSGL_INFO,"ID_AUDIO_NCH=%d\n", mpctx->sh_audio->channels); |
7864 | 3219 } |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
3220 mp_msg(MSGT_IDENTIFY,MSGL_INFO,"ID_LENGTH=%.2lf\n", demuxer_get_time_length(mpctx->demuxer)); |
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
3221 |
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
3222 if(!mpctx->sh_video) goto main; // audio-only |
175 | 3223 |
20947
6baefa24946f
moved video codec/filters/outdevice initialization code to specific function
nicodvb
parents:
20915
diff
changeset
|
3224 if(!reinit_video_chain()) { |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
3225 if(!mpctx->sh_video){ |
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
3226 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
|
3227 goto main; // exit_player(MSGTR_Exit_error); |
8198 | 3228 } |
3229 } | |
6755 | 3230 |
6110 | 3231 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
|
3232 spudec_set_hw_spu(vo_spudec,mpctx->video_out); |
6110 | 3233 |
7122
0dc9cb756b68
freetype 2.0/2.1+ support - disabled by default until bugs fixed
arpi
parents:
7111
diff
changeset
|
3234 #ifdef HAVE_FREETYPE |
0dc9cb756b68
freetype 2.0/2.1+ support - disabled by default until bugs fixed
arpi
parents:
7111
diff
changeset
|
3235 force_load_font = 1; |
0dc9cb756b68
freetype 2.0/2.1+ support - disabled by default until bugs fixed
arpi
parents:
7111
diff
changeset
|
3236 #endif |
0dc9cb756b68
freetype 2.0/2.1+ support - disabled by default until bugs fixed
arpi
parents:
7111
diff
changeset
|
3237 |
1 | 3238 //================== MAIN: ========================== |
7502
6a2b6f3d619c
best audio/video codec selection & init moved to libmpcodecs
arpi
parents:
7495
diff
changeset
|
3239 main: |
6a2b6f3d619c
best audio/video codec selection & init moved to libmpcodecs
arpi
parents:
7495
diff
changeset
|
3240 current_module="main"; |
6a2b6f3d619c
best audio/video codec selection & init moved to libmpcodecs
arpi
parents:
7495
diff
changeset
|
3241 |
17911
52f95509cd05
Add the new property API and implement a couple properties.
albeu
parents:
17910
diff
changeset
|
3242 if(playing_msg) { |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
3243 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
|
3244 mp_msg(MSGT_CPLAYER,MSGL_INFO,"%s",msg); |
52f95509cd05
Add the new property API and implement a couple properties.
albeu
parents:
17910
diff
changeset
|
3245 free(msg); |
52f95509cd05
Add the new property API and implement a couple properties.
albeu
parents:
17910
diff
changeset
|
3246 } |
52f95509cd05
Add the new property API and implement a couple properties.
albeu
parents:
17910
diff
changeset
|
3247 |
52f95509cd05
Add the new property API and implement a couple properties.
albeu
parents:
17910
diff
changeset
|
3248 |
18316
b3be7df634b0
spelling/grammar/wording fixes in doxygen and non-doxygen comments
diego
parents:
18315
diff
changeset
|
3249 // 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
|
3250 if(verbose) term_osd = 0; |
5151 | 3251 |
1 | 3252 { |
1420 | 3253 //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
|
3254 //float v_frame=0; // Video |
1 | 3255 float time_frame=0; // Timer |
1400 | 3256 //float num_frames=0; // number of frames played |
21077 | 3257 |
5929
9e7d54e7be58
- frame_time delayed one frame, as it's really duration of current frame,
arpi
parents:
5927
diff
changeset
|
3258 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
|
3259 int blit_frame=0; |
22288
da8ba4c0fc57
Cleanup, move "global" state from the frame_time_remaining mainloop
uau
parents:
22286
diff
changeset
|
3260 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
|
3261 |
18316
b3be7df634b0
spelling/grammar/wording fixes in doxygen and non-doxygen comments
diego
parents:
18315
diff
changeset
|
3262 // Make sure old OSD does not stay around, |
16402 | 3263 // e.g. with -fixed-vo and same-resolution files |
17938 | 3264 clear_osd_msgs(); |
3265 update_osd_msg(); | |
6028
bd016664dc18
UMRs fixed - noticed by Nilmoni Deb <ndeb@ece.cmu.edu>
arpi
parents:
6016
diff
changeset
|
3266 |
1 | 3267 //================ SETUP AUDIO ========================== |
3268 | |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
3269 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
|
3270 reinit_audio_chain(); |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
3271 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
|
3272 mp_msg(MSGT_IDENTIFY,MSGL_INFO, "ID_AUDIO_CODEC=%s\n", mpctx->sh_audio->codec->name); |
1 | 3273 } |
3274 | |
5151 | 3275 current_module="av_init"; |
3276 | |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
3277 if(mpctx->sh_video){ |
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
3278 mpctx->sh_video->timer=0; |
17654 | 3279 if (! ignore_start) |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
3280 audio_delay += mpctx->sh_video->stream_delay; |
17643 | 3281 } |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
3282 if(mpctx->sh_audio){ |
17654 | 3283 if (! ignore_start) |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
3284 audio_delay -= mpctx->sh_audio->stream_delay; |
22488 | 3285 mpctx->delay=-audio_delay; |
17643 | 3286 } |
1 | 3287 |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
3288 if(!mpctx->sh_audio){ |
1973
5216f108cb4f
all error/warn/info messages moved to help_mp-en.h for translation
arpi
parents:
1962
diff
changeset
|
3289 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
|
3290 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
|
3291 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
|
3292 //mpctx->d_audio->id=-2; // do not read audio chunks |
7621
7caeb275ad26
uninit cleanup again... thx to Nilmoni Deb for bugreport
arpi
parents:
7614
diff
changeset
|
3293 //uninit_player(INITED_AO); // close device |
1 | 3294 } |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
3295 if(!mpctx->sh_video){ |
6930 | 3296 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
|
3297 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
|
3298 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
|
3299 mpctx->d_video->id=-2; |
7677
33562a65e9e8
_EXPERIMENTAL_ option: -fixed-vo for libvo spec compliance testing
arpi
parents:
7628
diff
changeset
|
3300 //if(!fixed_vo) uninit_player(INITED_VO); |
5151 | 3301 } |
1 | 3302 |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
3303 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
|
3304 goto goto_next_file; |
7e769ea2acc7
jump to next file (or exit) if can't decode audio && video
alex
parents:
6183
diff
changeset
|
3305 |
8030
2b39ff3860b7
cleanup of .AVI timestamp calculation (ugly hack from mplayer.c removed,
arpi
parents:
8027
diff
changeset
|
3306 //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
|
3307 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
|
3308 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
|
3309 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
|
3310 mp_msg(MSGT_CPLAYER,MSGL_INFO,MSGTR_FPSforced,mpctx->sh_video->fps,mpctx->sh_video->frametime); |
398 | 3311 } |
1 | 3312 |
19946
ef94dfe93fe8
Fix the sound mute switch in the GUI menu by moving the corresponding
diego
parents:
19945
diff
changeset
|
3313 #ifdef HAVE_NEW_GUI |
ef94dfe93fe8
Fix the sound mute switch in the GUI menu by moving the corresponding
diego
parents:
19945
diff
changeset
|
3314 if ( use_gui ) { |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
3315 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
|
3316 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
|
3317 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
|
3318 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
|
3319 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
|
3320 } |
ef94dfe93fe8
Fix the sound mute switch in the GUI menu by moving the corresponding
diego
parents:
19945
diff
changeset
|
3321 #endif |
ef94dfe93fe8
Fix the sound mute switch in the GUI menu by moving the corresponding
diego
parents:
19945
diff
changeset
|
3322 |
23477 | 3323 mp_input_set_section(NULL); |
3324 //TODO: add desired (stream-based) sections here | |
3325 if (mpctx->stream->type==STREAMTYPE_TV) mp_input_set_section("tv"); | |
3326 | |
1639 | 3327 //==================== START PLAYING ======================= |
3328 | |
9105
9b387eae87e6
Secondly, fixed bug where -loop after file would play one too many times.
arpi
parents:
9090
diff
changeset
|
3329 if(loop_times>1) loop_times--; else |
9b387eae87e6
Secondly, fixed bug where -loop after file would play one too many times.
arpi
parents:
9090
diff
changeset
|
3330 if(loop_times==1) loop_times = -1; |
9b387eae87e6
Secondly, fixed bug where -loop after file would play one too many times.
arpi
parents:
9090
diff
changeset
|
3331 |
22299
073bd05d00a6
Remove useless fflush(stdout) calls. mp_msg already flushes output, and
uau
parents:
22298
diff
changeset
|
3332 mp_msg(MSGT_CPLAYER,MSGL_INFO,MSGTR_StartPlaying); |
1 | 3333 |
1124
0e95f30ffd4c
-frames and -benchmark options to make chl & gabucino happy
arpi_esp
parents:
1059
diff
changeset
|
3334 total_time_usage_start=GetTimer(); |
3934
e8e7ca8995a1
codecs.conf parser hangup fixed by iive, cpu usage reset at start
arpi
parents:
3843
diff
changeset
|
3335 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
|
3336 total_frame_cnt=0; drop_frame_cnt=0; // fix for multifile fps benchmark |
6590 | 3337 play_n_frames=play_n_frames_mf; |
3338 | |
3339 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
|
3340 mpctx->eof=PT_NEXT_ENTRY; goto goto_next_file; |
6590 | 3341 } |
3342 | |
22338
434cd072b0d3
Seek to -ss position without first starting audio/video from the start.
uau
parents:
22313
diff
changeset
|
3343 if (seek_to_sec) { |
434cd072b0d3
Seek to -ss position without first starting audio/video from the start.
uau
parents:
22313
diff
changeset
|
3344 seek(mpctx, seek_to_sec, 1); |
434cd072b0d3
Seek to -ss position without first starting audio/video from the start.
uau
parents:
22313
diff
changeset
|
3345 end_at.pos += seek_to_sec; |
434cd072b0d3
Seek to -ss position without first starting audio/video from the start.
uau
parents:
22313
diff
changeset
|
3346 } |
434cd072b0d3
Seek to -ss position without first starting audio/video from the start.
uau
parents:
22313
diff
changeset
|
3347 |
434cd072b0d3
Seek to -ss position without first starting audio/video from the start.
uau
parents:
22313
diff
changeset
|
3348 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
|
3349 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
|
3350 end_at.type = END_AT_NONE; |
434cd072b0d3
Seek to -ss position without first starting audio/video from the start.
uau
parents:
22313
diff
changeset
|
3351 } |
434cd072b0d3
Seek to -ss position without first starting audio/video from the start.
uau
parents:
22313
diff
changeset
|
3352 |
434cd072b0d3
Seek to -ss position without first starting audio/video from the start.
uau
parents:
22313
diff
changeset
|
3353 |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
3354 while(!mpctx->eof){ |
1439 | 3355 float aq_sleep_time=0; |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
3356 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
|
3357 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
|
3358 mpctx->sh_audio->ds = mpctx->d_audio; |
18897
78547a882a09
support for audio streams that appear after unsuccessful probing
nicodvb
parents:
18888
diff
changeset
|
3359 reinit_audio_chain(); |
78547a882a09
support for audio streams that appear after unsuccessful probing
nicodvb
parents:
18888
diff
changeset
|
3360 } |
1 | 3361 |
3362 /*========================== PLAY AUDIO ============================*/ | |
5610 | 3363 |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
3364 if (mpctx->sh_audio) |
20889
35f37142f3b8
Move audio playing code from main() into a separate function.
uau
parents:
20888
diff
changeset
|
3365 if (!fill_audio_out_buffers()) |
35f37142f3b8
Move audio playing code from main() into a separate function.
uau
parents:
20888
diff
changeset
|
3366 // 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
|
3367 if (!mpctx->sh_video) |
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
3368 mpctx->eof = PT_NEXT_ENTRY; |
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
3369 |
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
3370 |
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
3371 if(!mpctx->sh_video) { |
5610 | 3372 // handle audio-only case: |
19973
02a18c52a42a
after a long time, finally i could add -endpos option to mplayer executable.
ptt
parents:
19946
diff
changeset
|
3373 double a_pos=0; |
02a18c52a42a
after a long time, finally i could add -endpos option to mplayer executable.
ptt
parents:
19946
diff
changeset
|
3374 if(!quiet || 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
|
3375 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
|
3376 |
02a18c52a42a
after a long time, finally i could add -endpos option to mplayer executable.
ptt
parents:
19946
diff
changeset
|
3377 if(!quiet) |
13857
38424a8eb0ea
reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents:
13794
diff
changeset
|
3378 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
|
3379 |
02a18c52a42a
after a long time, finally i could add -endpos option to mplayer executable.
ptt
parents:
19946
diff
changeset
|
3380 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
|
3381 mpctx->eof = PT_NEXT_ENTRY; |
20902
bfb6eacd9c4a
Update OSD contents only after the correct values for the frame are known.
uau
parents:
20900
diff
changeset
|
3382 update_osd_msg(); |
19973
02a18c52a42a
after a long time, finally i could add -endpos option to mplayer executable.
ptt
parents:
19946
diff
changeset
|
3383 |
5610 | 3384 } else { |
4587
886bf5274992
Audio only support. Include a fix in the asf demuxer opening.
albeu
parents:
4552
diff
changeset
|
3385 |
1 | 3386 /*========================== PLAY VIDEO ============================*/ |
3387 | |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
3388 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
|
3389 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
|
3390 |
22288
da8ba4c0fc57
Cleanup, move "global" state from the frame_time_remaining mainloop
uau
parents:
22286
diff
changeset
|
3391 if (!mpctx->num_buffered_frames) { |
21077 | 3392 double frame_time = update_video(&blit_frame); |
3393 mp_dbg(MSGT_AVSYNC,MSGL_DBG2,"*** ftime=%5.3f ***\n",frame_time); | |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
3394 if (mpctx->sh_video->vf_inited < 0) { |
21077 | 3395 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
|
3396 mpctx->eof = 1; goto goto_next_file; |
21077 | 3397 } |
3398 if (frame_time < 0) | |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
3399 mpctx->eof = 1; |
22288
da8ba4c0fc57
Cleanup, move "global" state from the frame_time_remaining mainloop
uau
parents:
22286
diff
changeset
|
3400 else { |
da8ba4c0fc57
Cleanup, move "global" state from the frame_time_remaining mainloop
uau
parents:
22286
diff
changeset
|
3401 // 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
|
3402 mpctx->num_buffered_frames += blit_frame; |
21077 | 3403 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
|
3404 } |
5929
9e7d54e7be58
- frame_time delayed one frame, as it's really duration of current frame,
arpi
parents:
5927
diff
changeset
|
3405 } |
9e7d54e7be58
- frame_time delayed one frame, as it's really duration of current frame,
arpi
parents:
5927
diff
changeset
|
3406 |
5610 | 3407 // ========================================================================== |
2567 | 3408 |
5643 | 3409 // current_module="draw_osd"; |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
3410 // if(vo_config_count) mpctx->video_out->draw_osd(); |
1 | 3411 |
5610 | 3412 #ifdef HAVE_NEW_GUI |
3413 if(use_gui) guiEventHandling(); | |
3414 #endif | |
3415 | |
20894 | 3416 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
|
3417 if (vo_config_count) mpctx->video_out->check_events(); |
20894 | 3418 |
20900
b0f2e9a16bb1
Move xscreensaver_heartbeat call next to vo check_events
uau
parents:
20899
diff
changeset
|
3419 #ifdef HAVE_X11 |
b0f2e9a16bb1
Move xscreensaver_heartbeat call next to vo check_events
uau
parents:
20899
diff
changeset
|
3420 if (stop_xscreensaver) { |
b0f2e9a16bb1
Move xscreensaver_heartbeat call next to vo check_events
uau
parents:
20899
diff
changeset
|
3421 current_module = "stop_xscreensaver"; |
b0f2e9a16bb1
Move xscreensaver_heartbeat call next to vo check_events
uau
parents:
20899
diff
changeset
|
3422 xscreensaver_heartbeat(); |
b0f2e9a16bb1
Move xscreensaver_heartbeat call next to vo check_events
uau
parents:
20899
diff
changeset
|
3423 } |
b0f2e9a16bb1
Move xscreensaver_heartbeat call next to vo check_events
uau
parents:
20899
diff
changeset
|
3424 #endif |
b0f2e9a16bb1
Move xscreensaver_heartbeat call next to vo check_events
uau
parents:
20899
diff
changeset
|
3425 |
20899
c00d8c1aa0ab
Replace sleep time calculation in main() with a separate function.
uau
parents:
20898
diff
changeset
|
3426 frame_time_remaining = sleep_until_update(&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
|
3427 |
5610 | 3428 //====================== FLIP PAGE (VIDEO BLT): ========================= |
3429 | |
715 | 3430 current_module="flip_page"; |
20898 | 3431 if (!frame_time_remaining && blit_frame) { |
1962 | 3432 unsigned int t2=GetTimer(); |
2889
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
3433 |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
3434 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
|
3435 mpctx->num_buffered_frames--; |
15895
7742302e793d
Do not count skipped/broken frames when using -frames
reimar
parents:
15865
diff
changeset
|
3436 |
20898 | 3437 vout_time_usage += (GetTimer() - t2) * 0.000001; |
8450 | 3438 } |
5610 | 3439 //====================== A-V TIMESTAMP CORRECTION: ========================= |
3440 | |
20887 | 3441 adjust_sync_and_print_status(frame_time_remaining, time_frame); |
5610 | 3442 |
3443 //============================ Auto QUALITY ============================ | |
1 | 3444 |
1439 | 3445 /*Output quality adjustments:*/ |
3446 if(auto_quality>0){ | |
5610 | 3447 current_module="autoq"; |
1496 | 3448 // float total=0.000001f * (GetTimer()-aq_total_time); |
1439 | 3449 // if(output_quality<auto_quality && aq_sleep_time>0.05f*total) |
3450 if(output_quality<auto_quality && aq_sleep_time>0) | |
3451 ++output_quality; | |
3452 else | |
3453 // if(output_quality>0 && aq_sleep_time<-0.05f*total) | |
3454 if(output_quality>1 && aq_sleep_time<0) | |
3455 --output_quality; | |
3456 else | |
3457 if(output_quality>0 && aq_sleep_time<-0.050f) // 50ms | |
3458 output_quality=0; | |
3459 // 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
|
3460 set_video_quality(mpctx->sh_video,output_quality); |
1439 | 3461 } |
3462 | |
20897
b85131ecee3d
Move -frames check out of frame flip code (like -endpos earlier)
uau
parents:
20896
diff
changeset
|
3463 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
|
3464 --play_n_frames; |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
3465 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
|
3466 } |
b85131ecee3d
Move -frames check out of frame flip code (like -endpos earlier)
uau
parents:
20896
diff
changeset
|
3467 |
b85131ecee3d
Move -frames check out of frame flip code (like -endpos earlier)
uau
parents:
20896
diff
changeset
|
3468 |
20895
798356663969
Move endpos handling from page flip code to a saner location, change < to <=
uau
parents:
20894
diff
changeset
|
3469 // 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
|
3470 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
|
3471 !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
|
3472 mpctx->eof = PT_NEXT_ENTRY; |
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
3473 |
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
3474 } // end if(mpctx->sh_video) |
5610 | 3475 |
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
|
3476 #ifdef USE_DVDNAV |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
3477 if (mpctx->stream->type == STREAMTYPE_DVDNAV) { |
21200 | 3478 nav_highlight_t hl; |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
3479 mp_dvdnav_get_highlight (mpctx->stream, &hl); |
21219 | 3480 osd_set_nav_box (hl.sx, hl.sy, hl.ex, hl.ey); |
3481 vo_osd_changed (OSDTYPE_DVDNAV); | |
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
|
3482 } |
a067e7e18b50
support for dvdnav menu buttons overlay as simple alpha boxes (rework from Otvos Attila's series of patches)
ben
parents:
21161
diff
changeset
|
3483 #endif |
a067e7e18b50
support for dvdnav menu buttons overlay as simple alpha boxes (rework from Otvos Attila's series of patches)
ben
parents:
21161
diff
changeset
|
3484 |
5610 | 3485 //============================ Handle PAUSE =============================== |
3486 | |
3487 current_module="pause"; | |
4587
886bf5274992
Audio only support. Include a fix in the asf demuxer opening.
albeu
parents:
4552
diff
changeset
|
3488 |
220 | 3489 if(osd_visible){ |
18287
292337d09af2
Remove updating of vo_mouse_timer_const from the main loop and also
uau
parents:
18286
diff
changeset
|
3490 // 36000000 means max timed visibility is 1 hour into the future, if |
292337d09af2
Remove updating of vo_mouse_timer_const from the main loop and also
uau
parents:
18286
diff
changeset
|
3491 // the difference is greater assume it's wrapped around from below 0 |
292337d09af2
Remove updating of vo_mouse_timer_const from the main loop and also
uau
parents:
18286
diff
changeset
|
3492 if (osd_visible - GetTimerMS() > 36000000) { |
292337d09af2
Remove updating of vo_mouse_timer_const from the main loop and also
uau
parents:
18286
diff
changeset
|
3493 osd_visible = 0; |
5638
86663f1b9b00
new osd code, use osd objs to follow changes and do minimal updates
arpi
parents:
5627
diff
changeset
|
3494 vo_osd_progbar_type=-1; // disable |
86663f1b9b00
new osd code, use osd objs to follow changes and do minimal updates
arpi
parents:
5627
diff
changeset
|
3495 vo_osd_changed(OSDTYPE_PROGBAR); |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
3496 if (mpctx->osd_function != OSD_PAUSE) |
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
3497 mpctx->osd_function = OSD_PLAY; |
1504
f4f686aed404
modified mplayer.c to rewert to PLAY after rewinding after 1 sec
atlka
parents:
1501
diff
changeset
|
3498 } |
220 | 3499 } |
371 | 3500 |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
3501 if (mpctx->osd_function == OSD_PAUSE) { |
21082 | 3502 pause_loop(); |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
3503 mpctx->was_paused = 1; |
371 | 3504 } |
3505 | |
5610 | 3506 // handle -sstep |
2436 | 3507 if(step_sec>0) { |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
3508 mpctx->osd_function=OSD_FFW; |
2436 | 3509 rel_seek_secs+=step_sec; |
3510 } | |
1 | 3511 |
22298 | 3512 edl_update(mpctx); |
8531
1aa2c9b460af
Merged EDL 0.5 patch - it's something like Quicktime's edit lists.
arpi
parents:
8494
diff
changeset
|
3513 |
1 | 3514 //================= Keyboard events, SEEKing ==================== |
3515 | |
5610 | 3516 current_module="key_events"; |
3517 | |
4418
8141d2c399e4
A new configurable input system and joystick support for this system
albeu
parents:
4395
diff
changeset
|
3518 { |
8141d2c399e4
A new configurable input system and joystick support for this system
albeu
parents:
4395
diff
changeset
|
3519 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
|
3520 int brk_cmd = 0; |
13603 | 3521 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
|
3522 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
|
3523 mp_cmd_free(cmd); |
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
3524 if (brk_cmd == 2) |
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
3525 goto goto_enable_cache; |
4418
8141d2c399e4
A new configurable input system and joystick support for this system
albeu
parents:
4395
diff
changeset
|
3526 } |
8141d2c399e4
A new configurable input system and joystick support for this system
albeu
parents:
4395
diff
changeset
|
3527 } |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
3528 mpctx->was_paused = 0; |
7111 | 3529 |
2365 | 3530 /* Looping. */ |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
3531 if(mpctx->eof==1 && loop_times>=0) { |
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
3532 mp_msg(MSGT_CPLAYER,MSGL_V,"loop_times = %d, eof = %d\n", loop_times,mpctx->eof); |
2365 | 3533 |
3540 | 3534 if(loop_times>1) loop_times--; else |
3535 if(loop_times==1) loop_times=-1; | |
8198 | 3536 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
|
3537 mpctx->eof=0; |
22365 | 3538 abs_seek_pos=1; rel_seek_secs=seek_to_sec; |
8784 | 3539 loop_seek = 1; |
2365 | 3540 } |
3541 | |
1627
eeaee1632340
absolute seek debugging with 1-8 keys (disabled by default)
arpi
parents:
1626
diff
changeset
|
3542 if(rel_seek_secs || abs_seek_pos){ |
22300 | 3543 if (seek(mpctx, rel_seek_secs, abs_seek_pos) >= 0) { |
1334 | 3544 // Set OSD: |
16992
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
3545 if(!loop_seek){ |
58e526a6a8dc
Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents:
16968
diff
changeset
|
3546 if( !edl_decision ) |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
3547 set_osd_bar(0,"Position",0,100,demuxer_get_percent_pos(mpctx->demuxer)); |
1334 | 3548 } |
22300 | 3549 // osd_function has been set (or not) by the code triggering the seek |
18287
292337d09af2
Remove updating of vo_mouse_timer_const from the main loop and also
uau
parents:
18286
diff
changeset
|
3550 osd_visible=(GetTimerMS() + 1000) | 1; // to revert to PLAY pointer after 1 sec |
1 | 3551 } |
22298 | 3552 |
1405 | 3553 rel_seek_secs=0; |
1627
eeaee1632340
absolute seek debugging with 1-8 keys (disabled by default)
arpi
parents:
1626
diff
changeset
|
3554 abs_seek_pos=0; |
8784 | 3555 loop_seek=0; |
22301 | 3556 edl_decision = 0; |
1466 | 3557 } |
3558 | |
1723
5e4214a7540e
GUI stuff. now seeking works, and xmga renders to video window
arpi
parents:
1709
diff
changeset
|
3559 #ifdef HAVE_NEW_GUI |
5e4214a7540e
GUI stuff. now seeking works, and xmga renders to video window
arpi
parents:
1709
diff
changeset
|
3560 if(use_gui){ |
5789 | 3561 guiEventHandling(); |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
3562 if(mpctx->demuxer->file_format==DEMUXER_TYPE_AVI && mpctx->sh_video && mpctx->sh_video->video.dwLength>2){ |
1735 | 3563 // 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
|
3564 guiIntfStruct.Position=(float)mpctx->d_video->pack_no*100.0f/mpctx->sh_video->video.dwLength; |
1735 | 3565 } else { |
22808
c9b6a804f753
Gui: Allow progress bar to move when playing mov or mp4 files
cehoyos
parents:
22751
diff
changeset
|
3566 guiIntfStruct.Position=demuxer_get_percent_pos(mpctx->demuxer); |
1735 | 3567 } |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
3568 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
|
3569 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
|
3570 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
|
3571 guiGetEvent( guiReDraw,NULL ); |
6903 | 3572 guiGetEvent( guiSetVolume,NULL ); |
4818
3473ca9ef158
new gui interface, and gtk moved into mplayer process. fork ... bleh :)
pontscho
parents:
4807
diff
changeset
|
3573 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
|
3574 if(guiIntfStruct.Playing==2) mpctx->osd_function=OSD_PAUSE; |
8423 | 3575 if ( guiIntfStruct.DiskChanged || guiIntfStruct.NewPlay ) goto goto_next_file; |
3054 | 3576 #ifdef USE_DVDREAD |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
3577 if ( mpctx->stream->type == STREAMTYPE_DVD ) |
3054 | 3578 { |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
3579 dvd_priv_t * dvdp = mpctx->stream->priv; |
7854 | 3580 guiIntfStruct.DVD.current_chapter=dvd_chapter_from_cell(dvdp,guiIntfStruct.DVD.current_title-1, dvdp->cur_cell)+1; |
3054 | 3581 } |
3582 #endif | |
1723
5e4214a7540e
GUI stuff. now seeking works, and xmga renders to video window
arpi
parents:
1709
diff
changeset
|
3583 } |
16490
f17b3c152fd6
Add comments to a few #endif statements in order to make clear which
diego
parents:
16489
diff
changeset
|
3584 #endif /* HAVE_NEW_GUI */ |
1723
5e4214a7540e
GUI stuff. now seeking works, and xmga renders to video window
arpi
parents:
1709
diff
changeset
|
3585 |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
3586 } // while(!mpctx->eof) |
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
3587 |
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
3588 mp_msg(MSGT_GLOBAL,MSGL_V,"EOF code: %d \n",mpctx->eof); |
1 | 3589 |
18286 | 3590 #ifdef HAS_DVBIN_SUPPORT |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
3591 if(mpctx->dvbin_reopen) |
18286 | 3592 { |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
3593 mpctx->eof = 0; |
22458 | 3594 uninit_player(INITED_ALL-(INITED_GUI|INITED_STREAM|INITED_INPUT|INITED_GETCH2|(fixed_vo?INITED_VO:0))); |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
3595 cache_uninit(mpctx->stream); |
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
3596 mpctx->dvbin_reopen = 0; |
18286 | 3597 goto goto_enable_cache; |
3598 } | |
3599 #endif | |
1639 | 3600 } |
3601 | |
3618 | 3602 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
|
3603 |
6138
523014df7d32
big cosmetics patch, cleanup of messages printed by mplayer and libs.
arpi
parents:
6135
diff
changeset
|
3604 mp_msg(MSGT_CPLAYER,MSGL_INFO,"\n"); |
523014df7d32
big cosmetics patch, cleanup of messages printed by mplayer and libs.
arpi
parents:
6135
diff
changeset
|
3605 |
4221 | 3606 if(benchmark){ |
3607 double tot=video_time_usage+vout_time_usage+audio_time_usage; | |
3608 double total_time_usage; | |
3609 total_time_usage_start=GetTimer()-total_time_usage_start; | |
3610 total_time_usage = (float)total_time_usage_start*0.000001; | |
5151 | 3611 mp_msg(MSGT_CPLAYER,MSGL_INFO,"\nBENCHMARKs: VC:%8.3fs VO:%8.3fs A:%8.3fs Sys:%8.3fs = %8.3fs\n", |
4221 | 3612 video_time_usage,vout_time_usage,audio_time_usage, |
3613 total_time_usage-tot,total_time_usage); | |
3614 if(total_time_usage>0.0) | |
5151 | 3615 mp_msg(MSGT_CPLAYER,MSGL_INFO,"BENCHMARK%%: VC:%8.4f%% VO:%8.4f%% A:%8.4f%% Sys:%8.4f%% = %8.4f%%\n", |
4221 | 3616 100.0*video_time_usage/total_time_usage, |
3617 100.0*vout_time_usage/total_time_usage, | |
3618 100.0*audio_time_usage/total_time_usage, | |
3619 100.0*(total_time_usage-tot)/total_time_usage, | |
3620 100.0); | |
5983 | 3621 if(total_frame_cnt && frame_dropping) |
5621 | 3622 mp_msg(MSGT_CPLAYER,MSGL_INFO,"BENCHMARKn: disp: %d (%3.2f fps) drop: %d (%d%%) total: %d (%3.2f fps)\n", |
3623 total_frame_cnt-drop_frame_cnt, | |
3624 (total_time_usage>0.5)?((total_frame_cnt-drop_frame_cnt)/total_time_usage):0, | |
3625 drop_frame_cnt, | |
3626 100*drop_frame_cnt/total_frame_cnt, | |
3627 total_frame_cnt, | |
3628 (total_time_usage>0.5)?(total_frame_cnt/total_time_usage):0); | |
3629 | |
4221 | 3630 } |
3631 | |
5983 | 3632 // time to uninit all, except global stuff: |
7677
33562a65e9e8
_EXPERIMENTAL_ option: -fixed-vo for libvo spec compliance testing
arpi
parents:
7628
diff
changeset
|
3633 uninit_player(INITED_ALL-(INITED_GUI+INITED_INPUT+(fixed_vo?INITED_VO:0))); |
5154 | 3634 |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
3635 if ( mpctx->set_of_sub_size > 0 ) |
9048 | 3636 { |
3637 current_module="sub_free"; | |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
3638 for (i = 0; i < mpctx->set_of_sub_size; ++i) { |
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
3639 sub_free( mpctx->set_of_subtitles[i] ); |
18937
9e95ac641e77
Initial libass release (without mencoder support).
eugeni
parents:
18934
diff
changeset
|
3640 #ifdef USE_ASS |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
3641 if ( mpctx->set_of_ass_tracks[i] ) |
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
3642 ass_free_track( mpctx->set_of_ass_tracks[i] ); |
18937
9e95ac641e77
Initial libass release (without mencoder support).
eugeni
parents:
18934
diff
changeset
|
3643 #endif |
9e95ac641e77
Initial libass release (without mencoder support).
eugeni
parents:
18934
diff
changeset
|
3644 } |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
3645 mpctx->set_of_sub_size = 0; |
20341
0bc1f3c65d9f
Do not forget to clear subtitles when switching files for embedded subtitles.
reimar
parents:
20323
diff
changeset
|
3646 } |
14684 | 3647 vo_sub_last = vo_sub=NULL; |
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9831
diff
changeset
|
3648 subdata=NULL; |
18937
9e95ac641e77
Initial libass release (without mencoder support).
eugeni
parents:
18934
diff
changeset
|
3649 #ifdef USE_ASS |
9e95ac641e77
Initial libass release (without mencoder support).
eugeni
parents:
18934
diff
changeset
|
3650 ass_track = NULL; |
9e95ac641e77
Initial libass release (without mencoder support).
eugeni
parents:
18934
diff
changeset
|
3651 #endif |
9048 | 3652 |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
3653 if(mpctx->eof == PT_NEXT_ENTRY || mpctx->eof == PT_PREV_ENTRY) { |
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
3654 mpctx->eof = mpctx->eof == PT_NEXT_ENTRY ? 1 : -1; |
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
3655 if(play_tree_iter_step(mpctx->playtree_iter,mpctx->play_tree_step,0) == PLAY_TREE_ITER_ENTRY) { |
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
3656 mpctx->eof = 1; |
4045
898caa690c0b
playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents:
3934
diff
changeset
|
3657 } else { |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
3658 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
|
3659 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
|
3660 } |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
3661 mpctx->play_tree_step = 1; |
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
3662 } else if (mpctx->eof == PT_UP_NEXT || mpctx->eof == PT_UP_PREV) { |
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
3663 mpctx->eof = mpctx->eof == PT_UP_NEXT ? 1 : -1; |
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
3664 if ( mpctx->playtree_iter ) { |
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
3665 if(play_tree_iter_up_step(mpctx->playtree_iter,mpctx->eof,0) == PLAY_TREE_ITER_ENTRY) { |
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
3666 mpctx->eof = 1; |
9368 | 3667 } else { |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
3668 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
|
3669 mpctx->playtree_iter = NULL; |
9368 | 3670 } |
3671 } | |
5154 | 3672 } else { // NEXT PREV SRC |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
3673 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
|
3674 } |
1639 | 3675 |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
3676 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
|
3677 |
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
3678 while(mpctx->playtree_iter != NULL) { |
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
3679 filename = play_tree_iter_get_file(mpctx->playtree_iter,mpctx->eof); |
4045
898caa690c0b
playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents:
3934
diff
changeset
|
3680 if(filename == NULL) { |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
3681 if( play_tree_iter_step(mpctx->playtree_iter,mpctx->eof,0) != PLAY_TREE_ITER_ENTRY) { |
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
3682 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
|
3683 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
|
3684 }; |
898caa690c0b
playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents:
3934
diff
changeset
|
3685 } else |
898caa690c0b
playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents:
3934
diff
changeset
|
3686 break; |
898caa690c0b
playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents:
3934
diff
changeset
|
3687 } |
898caa690c0b
playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents:
3934
diff
changeset
|
3688 |
5910
20c335d98ab3
fix fullscreen bug es ilyen libvo not initialized bug with gui igy
pontscho
parents:
5908
diff
changeset
|
3689 #ifdef HAVE_NEW_GUI |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
3690 if( use_gui && !mpctx->playtree_iter ) |
5910
20c335d98ab3
fix fullscreen bug es ilyen libvo not initialized bug with gui igy
pontscho
parents:
5908
diff
changeset
|
3691 { |
20c335d98ab3
fix fullscreen bug es ilyen libvo not initialized bug with gui igy
pontscho
parents:
5908
diff
changeset
|
3692 #ifdef USE_DVDREAD |
6280 | 3693 if ( !guiIntfStruct.DiskChanged ) |
5910
20c335d98ab3
fix fullscreen bug es ilyen libvo not initialized bug with gui igy
pontscho
parents:
5908
diff
changeset
|
3694 #endif |
6713 | 3695 mplEnd(); |
5910
20c335d98ab3
fix fullscreen bug es ilyen libvo not initialized bug with gui igy
pontscho
parents:
5908
diff
changeset
|
3696 } |
20c335d98ab3
fix fullscreen bug es ilyen libvo not initialized bug with gui igy
pontscho
parents:
5908
diff
changeset
|
3697 #endif |
20c335d98ab3
fix fullscreen bug es ilyen libvo not initialized bug with gui igy
pontscho
parents:
5908
diff
changeset
|
3698 |
22280
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
3699 if(use_gui || mpctx->playtree_iter != NULL || player_idle_mode){ |
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
3700 if (!mpctx->playtree_iter) filename = NULL; |
a5e5b0c45c03
Split command/property handling from mplayer.c to a new file command.c.
uau
parents:
22255
diff
changeset
|
3701 mpctx->eof = 0; |
1641
b7dae998505c
free stream/demuxer. continue playback with next file if error found
arpi
parents:
1639
diff
changeset
|
3702 goto play_next_file; |
1639 | 3703 } |
3704 | |
7122
0dc9cb756b68
freetype 2.0/2.1+ support - disabled by default until bugs fixed
arpi
parents:
7111
diff
changeset
|
3705 |
8644
0bfd73828e33
This patch fixes so that the exit code (or return code if you like) is set
arpi
parents:
8635
diff
changeset
|
3706 exit_player_with_rc(MSGTR_Exit_eof, 0); |
1639 | 3707 |
109 | 3708 return 1; |
3709 } |