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