Mercurial > mplayer.hg
annotate mplayer.c @ 14811:9bf82334ef8d
synced with 1.31
author | paszczi |
---|---|
date | Fri, 25 Feb 2005 09:22:46 +0000 |
parents | 664b06b907cb |
children | 663c1ea5f595 |
rev | line source |
---|---|
1430 | 1 #include <stdio.h> |
2 #include <stdlib.h> | |
12360 | 3 #include "config.h" |
4 | |
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
|
5 #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
|
6 #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
|
7 #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
|
8 #endif |
1430 | 9 #include <string.h> |
10 #include <unistd.h> | |
1428
a90d889eb649
largefile patch by Stephen Davies <steve@daviesfam.org>
arpi
parents:
1422
diff
changeset
|
11 |
5288
370d13663229
we don't use mmap() in mplayer.c, so why should we include mman.h...
arpi
parents:
5221
diff
changeset
|
12 // #include <sys/mman.h> |
1428
a90d889eb649
largefile patch by Stephen Davies <steve@daviesfam.org>
arpi
parents:
1422
diff
changeset
|
13 #include <sys/types.h> |
9831 | 14 #ifndef __MINGW32__ |
15 #include <sys/ioctl.h> | |
1428
a90d889eb649
largefile patch by Stephen Davies <steve@daviesfam.org>
arpi
parents:
1422
diff
changeset
|
16 #include <sys/wait.h> |
9831 | 17 #else |
18 #define SIGHUP 1 /* hangup */ | |
19 #define SIGQUIT 3 /* quit */ | |
20 #define SIGKILL 9 /* kill (cannot be caught or ignored) */ | |
21 #define SIGBUS 10 /* bus error */ | |
10928 | 22 extern int mp_input_win32_slave_cmd_func(int fd,char* dest,int size); |
9831 | 23 #endif |
24 | |
1428
a90d889eb649
largefile patch by Stephen Davies <steve@daviesfam.org>
arpi
parents:
1422
diff
changeset
|
25 #include <sys/time.h> |
a90d889eb649
largefile patch by Stephen Davies <steve@daviesfam.org>
arpi
parents:
1422
diff
changeset
|
26 #include <sys/stat.h> |
a90d889eb649
largefile patch by Stephen Davies <steve@daviesfam.org>
arpi
parents:
1422
diff
changeset
|
27 |
a90d889eb649
largefile patch by Stephen Davies <steve@daviesfam.org>
arpi
parents:
1422
diff
changeset
|
28 #include <signal.h> |
a90d889eb649
largefile patch by Stephen Davies <steve@daviesfam.org>
arpi
parents:
1422
diff
changeset
|
29 #include <time.h> |
a90d889eb649
largefile patch by Stephen Davies <steve@daviesfam.org>
arpi
parents:
1422
diff
changeset
|
30 #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
|
31 #include <limits.h> |
1428
a90d889eb649
largefile patch by Stephen Davies <steve@daviesfam.org>
arpi
parents:
1422
diff
changeset
|
32 |
5112 | 33 #include <errno.h> |
34 | |
1430 | 35 #include "version.h" |
1584 | 36 |
1564 | 37 #include "mp_msg.h" |
1 | 38 |
1584 | 39 #define HELP_MP_DEFINE_STATIC |
40 #include "help_mp.h" | |
41 | |
8164
487cfc28525d
New config system + cleanup of header inter dependency
albeu
parents:
8123
diff
changeset
|
42 #include "m_option.h" |
487cfc28525d
New config system + cleanup of header inter dependency
albeu
parents:
8123
diff
changeset
|
43 #include "m_config.h" |
9752 | 44 |
151 | 45 #include "cfg-mplayer-def.h" |
147 | 46 |
1422 | 47 #ifdef USE_SUB |
258 | 48 #include "subreader.h" |
1422 | 49 #endif |
258 | 50 |
36 | 51 #include "libvo/video_out.h" |
1422 | 52 |
5293
fd992ece4367
include font_load.h directly, instead of via video_out.h
arpi
parents:
5288
diff
changeset
|
53 #include "libvo/font_load.h" |
220 | 54 #include "libvo/sub.h" |
36 | 55 |
10211
4bc481804519
warning fixes by Dominik Mierzejewski <dominik@rangers.eu.org>
alex
parents:
10167
diff
changeset
|
56 #ifdef HAVE_X11 |
4bc481804519
warning fixes by Dominik Mierzejewski <dominik@rangers.eu.org>
alex
parents:
10167
diff
changeset
|
57 #include "libvo/x11_common.h" |
4bc481804519
warning fixes by Dominik Mierzejewski <dominik@rangers.eu.org>
alex
parents:
10167
diff
changeset
|
58 #endif |
4bc481804519
warning fixes by Dominik Mierzejewski <dominik@rangers.eu.org>
alex
parents:
10167
diff
changeset
|
59 |
955 | 60 #include "libao2/audio_out.h" |
61 | |
303 | 62 #include "codec-cfg.h" |
175 | 63 |
5380
8a01cde9cf39
DVDnav support patch by David Holm and Kees Cook <mplayer@outflux.net>
arpi
parents:
5367
diff
changeset
|
64 #ifdef USE_DVDNAV |
8a01cde9cf39
DVDnav support patch by David Holm and Kees Cook <mplayer@outflux.net>
arpi
parents:
5367
diff
changeset
|
65 #include <dvdnav.h> |
8a01cde9cf39
DVDnav support patch by David Holm and Kees Cook <mplayer@outflux.net>
arpi
parents:
5367
diff
changeset
|
66 #endif |
5488
3f183ca22747
fixed SPU pts, it's 1024/90000 based instead of 1/100
arpi
parents:
5463
diff
changeset
|
67 |
8531
1aa2c9b460af
Merged EDL 0.5 patch - it's something like Quicktime's edit lists.
arpi
parents:
8494
diff
changeset
|
68 #ifdef USE_EDL |
1aa2c9b460af
Merged EDL 0.5 patch - it's something like Quicktime's edit lists.
arpi
parents:
8494
diff
changeset
|
69 #include "edl.h" |
1aa2c9b460af
Merged EDL 0.5 patch - it's something like Quicktime's edit lists.
arpi
parents:
8494
diff
changeset
|
70 #endif |
1aa2c9b460af
Merged EDL 0.5 patch - it's something like Quicktime's edit lists.
arpi
parents:
8494
diff
changeset
|
71 |
560
28ae99036574
Separated dvdsub code to be able to work with it easier
lgb
parents:
557
diff
changeset
|
72 #include "spudec.h" |
4079 | 73 #include "vobsub.h" |
492 | 74 |
9380 | 75 #include "osdep/getch2.h" |
76 #include "osdep/timer.h" | |
1 | 77 |
2272 | 78 #include "cpudetect.h" |
79 | |
2036 | 80 #ifdef HAVE_NEW_GUI |
4798 | 81 #include "Gui/interface.h" |
2036 | 82 #endif |
83 | |
4418
8141d2c399e4
A new configurable input system and joystick support for this system
albeu
parents:
4395
diff
changeset
|
84 #include "input/input.h" |
8141d2c399e4
A new configurable input system and joystick support for this system
albeu
parents:
4395
diff
changeset
|
85 |
3322
cdd3f5ac06b2
-slave patch by Kilian A. Foth <foth@informatik.uni-hamburg.de>
arpi
parents:
3302
diff
changeset
|
86 int slave_mode=0; |
362 | 87 int verbose=0; |
7864 | 88 int identify=0; |
11875
6b28eb95c08b
* changes mencoder's exit code on explicit kill to 2
attila
parents:
11778
diff
changeset
|
89 int quiet=0; |
1 | 90 |
398 | 91 #define ABS(x) (((x)>=0)?(x):(-(x))) |
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 |
dc7b86065e3c
RTC support on FreeBSD, inspired by a patch from Michael Johnson
diego
parents:
14296
diff
changeset
|
101 #endif |
2889
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
102 #endif |
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 |
60c1b7c0ea21
added support for norm=,chanlist=,channel= and also on-the-fly channel chaning with keys
alex
parents:
2897
diff
changeset
|
105 #include "libmpdemux/tv.h" |
60c1b7c0ea21
added support for norm=,chanlist=,channel= and also on-the-fly channel chaning with keys
alex
parents:
2897
diff
changeset
|
106 #endif |
60c1b7c0ea21
added support for norm=,chanlist=,channel= and also on-the-fly channel chaning with keys
alex
parents:
2897
diff
changeset
|
107 |
9610 | 108 #ifdef HAS_DVBIN_SUPPORT |
109 #include "libmpdemux/dvbin.h" | |
10708 | 110 static int last_dvb_step = 1; |
9610 | 111 #endif |
112 | |
258 | 113 //**************************************************************************// |
4045
898caa690c0b
playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents:
3934
diff
changeset
|
114 // Playtree |
898caa690c0b
playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents:
3934
diff
changeset
|
115 //**************************************************************************// |
898caa690c0b
playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents:
3934
diff
changeset
|
116 #include "playtree.h" |
10211
4bc481804519
warning fixes by Dominik Mierzejewski <dominik@rangers.eu.org>
alex
parents:
10167
diff
changeset
|
117 #include "playtreeparser.h" |
4bc481804519
warning fixes by Dominik Mierzejewski <dominik@rangers.eu.org>
alex
parents:
10167
diff
changeset
|
118 |
4bc481804519
warning fixes by Dominik Mierzejewski <dominik@rangers.eu.org>
alex
parents:
10167
diff
changeset
|
119 #ifdef HAVE_NEW_GUI |
4bc481804519
warning fixes by Dominik Mierzejewski <dominik@rangers.eu.org>
alex
parents:
10167
diff
changeset
|
120 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
|
121 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
|
122 #endif |
4045
898caa690c0b
playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents:
3934
diff
changeset
|
123 |
898caa690c0b
playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents:
3934
diff
changeset
|
124 play_tree_t* playtree; |
8198 | 125 play_tree_iter_t* 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
|
126 |
4156
22fadd4022b5
playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents:
4152
diff
changeset
|
127 #define PT_NEXT_ENTRY 1 |
22fadd4022b5
playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents:
4152
diff
changeset
|
128 #define PT_PREV_ENTRY -1 |
22fadd4022b5
playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents:
4152
diff
changeset
|
129 #define PT_NEXT_SRC 2 |
22fadd4022b5
playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents:
4152
diff
changeset
|
130 #define PT_PREV_SRC -2 |
22fadd4022b5
playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents:
4152
diff
changeset
|
131 #define PT_UP_NEXT 3 |
22fadd4022b5
playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents:
4152
diff
changeset
|
132 #define PT_UP_PREV -3 |
22fadd4022b5
playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents:
4152
diff
changeset
|
133 |
22fadd4022b5
playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents:
4152
diff
changeset
|
134 //**************************************************************************// |
22fadd4022b5
playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents:
4152
diff
changeset
|
135 // Config |
22fadd4022b5
playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents:
4152
diff
changeset
|
136 //**************************************************************************// |
22fadd4022b5
playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents:
4152
diff
changeset
|
137 m_config_t* mconfig; |
22fadd4022b5
playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents:
4152
diff
changeset
|
138 |
8164
487cfc28525d
New config system + cleanup of header inter dependency
albeu
parents:
8123
diff
changeset
|
139 extern play_tree_t* |
487cfc28525d
New config system + cleanup of header inter dependency
albeu
parents:
8123
diff
changeset
|
140 m_config_parse_mp_command_line(m_config_t *config, int argc, char **argv); |
487cfc28525d
New config system + cleanup of header inter dependency
albeu
parents:
8123
diff
changeset
|
141 extern int |
487cfc28525d
New config system + cleanup of header inter dependency
albeu
parents:
8123
diff
changeset
|
142 m_config_parse_config_file(m_config_t* config, char *conffile); |
487cfc28525d
New config system + cleanup of header inter dependency
albeu
parents:
8123
diff
changeset
|
143 |
4045
898caa690c0b
playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents:
3934
diff
changeset
|
144 //**************************************************************************// |
258 | 145 // Config file |
146 //**************************************************************************// | |
147 | |
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
|
148 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
|
149 |
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
|
150 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
|
151 return m_config_parse_config_file(mconfig, filename); |
162 | 152 } |
153 | |
2557 | 154 #include "get_path.c" |
178 | 155 |
1 | 156 //**************************************************************************// |
9695 | 157 // XScreensaver |
158 //**************************************************************************// | |
159 | |
10661
49d7d02f4485
X11_FULLSCREEN vs HAVE_X11 definitions and some warning fixes
alex
parents:
10646
diff
changeset
|
160 #ifdef HAVE_X11 |
11999 | 161 void xscreensaver_heartbeat(void); |
10661
49d7d02f4485
X11_FULLSCREEN vs HAVE_X11 definitions and some warning fixes
alex
parents:
10646
diff
changeset
|
162 #endif |
9695 | 163 |
164 //**************************************************************************// | |
442 | 165 //**************************************************************************// |
166 // Input media streaming & demultiplexer: | |
167 //**************************************************************************// | |
168 | |
1289 | 169 static int max_framesize=0; |
170 | |
7559
b645204ea527
some cleanup - made private vars/funcs static, removed obsolete externs
arpi
parents:
7529
diff
changeset
|
171 #include "libmpdemux/stream.h" |
b645204ea527
some cleanup - made private vars/funcs static, removed obsolete externs
arpi
parents:
7529
diff
changeset
|
172 #include "libmpdemux/demuxer.h" |
b645204ea527
some cleanup - made private vars/funcs static, removed obsolete externs
arpi
parents:
7529
diff
changeset
|
173 #include "libmpdemux/stheader.h" |
b645204ea527
some cleanup - made private vars/funcs static, removed obsolete externs
arpi
parents:
7529
diff
changeset
|
174 //#include "parse_es.h" |
13132 | 175 #ifdef HAVE_MATROSKA |
176 #include "libmpdemux/matroska.h" | |
177 #endif | |
1 | 178 |
5607 | 179 #include "libmpcodecs/dec_audio.h" |
180 #include "libmpcodecs/dec_video.h" | |
8198 | 181 #include "libmpcodecs/mp_image.h" |
182 #include "libmpcodecs/vf.h" | |
2563 | 183 |
8123
9fc45fe0d444
*HUGE* set of compiler warning fixes, unused variables removal
arpi
parents:
8068
diff
changeset
|
184 extern void vf_list_plugins(); |
9fc45fe0d444
*HUGE* set of compiler warning fixes, unused variables removal
arpi
parents:
8068
diff
changeset
|
185 |
111 | 186 //**************************************************************************// |
1 | 187 //**************************************************************************// |
188 | |
112 | 189 // Common FIFO functions, and keyboard/event FIFO code |
190 #include "fifo.c" | |
12816 | 191 int noconsolecontrols=0; |
1 | 192 //**************************************************************************// |
193 | |
6755 | 194 vo_functions_t *video_out=NULL; |
4788
d678ce495a75
Moved HW dependent mixer stuff to libao and removed master switch
anders
parents:
4787
diff
changeset
|
195 ao_functions_t *audio_out=NULL; |
1 | 196 |
7677
33562a65e9e8
_EXPERIMENTAL_ option: -fixed-vo for libvo spec compliance testing
arpi
parents:
7628
diff
changeset
|
197 int fixed_vo=0; |
12332
6f5ae9f4eeb9
play the audio buffer in case of normal eof (i know the change is rude, but mplayer.c is hopelessly obfuscated)
alex
parents:
12306
diff
changeset
|
198 int eof=0; |
7677
33562a65e9e8
_EXPERIMENTAL_ option: -fixed-vo for libvo spec compliance testing
arpi
parents:
7628
diff
changeset
|
199 |
2557 | 200 // benchmark: |
1291 | 201 double video_time_usage=0; |
202 double vout_time_usage=0; | |
1289 | 203 static double audio_time_usage=0; |
204 static int total_time_usage_start=0; | |
5621 | 205 static int total_frame_cnt=0; |
206 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
|
207 int benchmark=0; |
1124
0e95f30ffd4c
-frames and -benchmark options to make chl & gabucino happy
arpi_esp
parents:
1059
diff
changeset
|
208 |
1014
e01dc1a88edf
fixed punkso's mess... local variables moved back to main()
arpi_esp
parents:
1009
diff
changeset
|
209 // options: |
6796 | 210 int auto_quality=0; |
1496 | 211 static int output_quality=0; |
1439 | 212 |
7605
c3bbe602aff3
new option -speed, to set playback speed rate (examples: -speed 1:3 or -speed 5)
arpi
parents:
7604
diff
changeset
|
213 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
|
214 |
1709 | 215 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
|
216 |
64b8c5a07c2c
- It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents:
9217
diff
changeset
|
217 #ifdef HAVE_NEW_GUI |
64b8c5a07c2c
- It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents:
9217
diff
changeset
|
218 int enqueue=0; |
64b8c5a07c2c
- It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents:
9217
diff
changeset
|
219 #endif |
64b8c5a07c2c
- It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents:
9217
diff
changeset
|
220 |
8612
a61d1b326beb
It shows not just the progressbar, but progressbar /and/ percentage
arpi
parents:
8606
diff
changeset
|
221 #define MAX_OSD_LEVEL 3 |
1709 | 222 |
6921 | 223 int osd_level=1; |
7516
657041b7236b
when working through a mixed play tree with audi-only files and video files
arpi
parents:
7506
diff
changeset
|
224 int osd_level_saved=-1; |
6619
f554e7271587
fix volume handling ( step 2 ) -- add balance support and some code cleanup and fix
pontscho
parents:
6590
diff
changeset
|
225 int osd_visible=100; |
2557 | 226 |
227 // seek: | |
7559
b645204ea527
some cleanup - made private vars/funcs static, removed obsolete externs
arpi
parents:
7529
diff
changeset
|
228 static char *seek_to_sec=NULL; |
b645204ea527
some cleanup - made private vars/funcs static, removed obsolete externs
arpi
parents:
7529
diff
changeset
|
229 static off_t seek_to_byte=0; |
b645204ea527
some cleanup - made private vars/funcs static, removed obsolete externs
arpi
parents:
7529
diff
changeset
|
230 static off_t step_sec=0; |
b645204ea527
some cleanup - made private vars/funcs static, removed obsolete externs
arpi
parents:
7529
diff
changeset
|
231 static int loop_times=-1; |
8784 | 232 static int loop_seek=0; |
7559
b645204ea527
some cleanup - made private vars/funcs static, removed obsolete externs
arpi
parents:
7529
diff
changeset
|
233 |
7576
c135f7646036
new opt: -autosync, controls ao->get_delay() smoothing (default: disabled)
arpi
parents:
7563
diff
changeset
|
234 // A/V sync: |
8311 | 235 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
|
236 |
7559
b645204ea527
some cleanup - made private vars/funcs static, removed obsolete externs
arpi
parents:
7529
diff
changeset
|
237 // may be changed by GUI: (FIXME!) |
2557 | 238 float rel_seek_secs=0; |
239 int abs_seek_pos=0; | |
240 | |
241 // codecs: | |
7529
c276bfb414fb
removed obsolete/unused audio|video_fm|codec, has_audio|video
arpi
parents:
7526
diff
changeset
|
242 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
|
243 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
|
244 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
|
245 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
|
246 |
1014
e01dc1a88edf
fixed punkso's mess... local variables moved back to main()
arpi_esp
parents:
1009
diff
changeset
|
247 // streaming: |
3532 | 248 int audio_id=-1; |
249 int video_id=-1; | |
3618 | 250 int dvdsub_id=-1; |
4079 | 251 int vobsub_id=-1; |
10167
531b00ad6f2d
Support for selecting the audio track in Matroska files via -alang.
mosu
parents:
10116
diff
changeset
|
252 char* audio_lang=NULL; |
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9831
diff
changeset
|
253 char* dvdsub_lang=NULL; |
5388
3af2729c5c87
* New command line switch for mplayer & mencoder:
kmkaplan
parents:
5380
diff
changeset
|
254 static char* spudec_ifo=NULL; |
6627 | 255 char* filename=NULL; //"MI2-Trailer.avi"; |
10917
d45870f67728
Forced subtitles patch by Arne Driescher <driescher@mpi-magdeburg.mpg.de>
attila
parents:
10884
diff
changeset
|
256 int forced_subs_only=0; |
1014
e01dc1a88edf
fixed punkso's mess... local variables moved back to main()
arpi_esp
parents:
1009
diff
changeset
|
257 |
2353 | 258 // cache2: |
7881
aba9301ed3c4
allow cache to be disabled (-nocache should override cachesize autodetection
arpi
parents:
7867
diff
changeset
|
259 int stream_cache_size=-1; |
2353 | 260 #ifdef USE_STREAM_CACHE |
261 extern int cache_fill_status; | |
12835
4235ae5a2d60
cache min fill adjustment, based on patch by Jeremy Huddleston
iive
parents:
12816
diff
changeset
|
262 |
4235ae5a2d60
cache min fill adjustment, based on patch by Jeremy Huddleston
iive
parents:
12816
diff
changeset
|
263 float stream_cache_min_percent=20.0; |
4235ae5a2d60
cache min fill adjustment, based on patch by Jeremy Huddleston
iive
parents:
12816
diff
changeset
|
264 float stream_cache_prefill_percent=5.0; |
2353 | 265 #else |
266 #define cache_fill_status 0 | |
267 #endif | |
268 | |
2557 | 269 // dump: |
3257 | 270 static char *stream_dump_name="stream.dump"; |
6796 | 271 int stream_dump_type=0; |
2557 | 272 |
273 // A-V sync: | |
1498 | 274 static float default_max_pts_correction=-1;//0.01f; |
275 static float max_pts_correction=0;//default_max_pts_correction; | |
2557 | 276 static float c_total=0; |
6796 | 277 float audio_delay=0; |
1014
e01dc1a88edf
fixed punkso's mess... local variables moved back to main()
arpi_esp
parents:
1009
diff
changeset
|
278 |
2889
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
279 static int softsleep=0; |
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
280 |
9055 | 281 float force_fps=0; |
2557 | 282 static int force_srate=0; |
7614 | 283 static int audio_output_format=0; |
6796 | 284 int frame_dropping=0; // option 0=no drop 1= drop vo 2= drop decode |
2557 | 285 static int play_n_frames=-1; |
6590 | 286 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
|
287 |
1 | 288 // screen info: |
7562
92188b57a062
video out driver list support (like -vc, example: -vo xmga,xv,x11,)
arpi
parents:
7559
diff
changeset
|
289 char** video_driver_list=NULL; |
92188b57a062
video out driver list support (like -vc, example: -vo xmga,xv,x11,)
arpi
parents:
7559
diff
changeset
|
290 char** audio_driver_list=NULL; |
5075 | 291 |
7559
b645204ea527
some cleanup - made private vars/funcs static, removed obsolete externs
arpi
parents:
7529
diff
changeset
|
292 extern char *vo_subdevice; |
b645204ea527
some cleanup - made private vars/funcs static, removed obsolete externs
arpi
parents:
7529
diff
changeset
|
293 extern char *ao_subdevice; |
b645204ea527
some cleanup - made private vars/funcs static, removed obsolete externs
arpi
parents:
7529
diff
changeset
|
294 |
7451
8669e56d2d98
some mpcodecs option declaration moved to cfg-*, as aren;t used by
arpi
parents:
7450
diff
changeset
|
295 // codec outfmt flags (defined in libmpcodecs/vd.c) |
5075 | 296 extern int vo_flags; |
1014
e01dc1a88edf
fixed punkso's mess... local variables moved back to main()
arpi_esp
parents:
1009
diff
changeset
|
297 |
e01dc1a88edf
fixed punkso's mess... local variables moved back to main()
arpi_esp
parents:
1009
diff
changeset
|
298 // sub: |
212 | 299 char *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
|
300 #ifdef HAVE_FONTCONFIG |
11584 | 301 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
|
302 #endif |
215 | 303 float font_factor=0.75; |
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9831
diff
changeset
|
304 char **sub_name=NULL; |
258 | 305 float sub_delay=0; |
306 float sub_fps=0; | |
510 | 307 int sub_auto = 1; |
4079 | 308 char *vobsub_name=NULL; |
1255
94f2853ec6f4
-dsp option removed, displaying help text (-ao oss:dsp_path)
alex
parents:
1250
diff
changeset
|
309 /*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
|
310 int subcc_enabled=0; |
8361
2202c00001e3
overlapping subtitles support is now optional, can be disabled (-nooverlapsub)
arpi
parents:
8360
diff
changeset
|
311 int suboverlap_enabled = 1; |
7150 | 312 #ifdef USE_SUB |
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9831
diff
changeset
|
313 sub_data* set_of_subtitles[MAX_SUBTITLE_FILES]; |
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9831
diff
changeset
|
314 int set_of_sub_size = 0; |
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9831
diff
changeset
|
315 int set_of_sub_pos = -1; |
7150 | 316 float sub_last_pts = -303; |
317 #endif | |
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
|
318 int global_sub_size = 0; // this encompasses all subtitle sources |
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
|
319 int global_sub_pos = -1; // this encompasses all subtitle sources |
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
|
320 #define SUB_SOURCE_SUBS 0 |
a5004eb92a79
fix sub_select fiasco with global sub numbering. now multiple sub sources can be managed in essentially one list.
joey
parents:
13500
diff
changeset
|
321 #define SUB_SOURCE_VOBSUB 1 |
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
|
322 #define SUB_SOURCE_DEMUX 2 |
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
|
323 #define SUB_SOURCES 3 |
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
|
324 int global_sub_indices[SUB_SOURCES]; |
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
|
325 int global_sub_quiet_osd_hack = 0; |
723 | 326 |
2321 | 327 static stream_t* stream=NULL; |
7058
2e5c07262861
new v4l capture patch by Jindrich Makovicka <makovick@kmlinux.fjfi.cvut.cz>:
arpi
parents:
7055
diff
changeset
|
328 static demuxer_t *demuxer=NULL; |
7621
7caeb275ad26
uninit cleanup again... thx to Nilmoni Deb for bugreport
arpi
parents:
7614
diff
changeset
|
329 static sh_audio_t *sh_audio=NULL; |
7caeb275ad26
uninit cleanup again... thx to Nilmoni Deb for bugreport
arpi
parents:
7614
diff
changeset
|
330 static sh_video_t *sh_video=NULL; |
7058
2e5c07262861
new v4l capture patch by Jindrich Makovicka <makovick@kmlinux.fjfi.cvut.cz>:
arpi
parents:
7055
diff
changeset
|
331 |
4818
3473ca9ef158
new gui interface, and gtk moved into mplayer process. fork ... bleh :)
pontscho
parents:
4807
diff
changeset
|
332 char* current_module=NULL; // for debugging |
1856 | 333 |
13341
0c41c3728568
fix ineffectual video equalizer command line options, patch by kiriuja <mplayer-bugs at en-directo.net>, closes #37, some more variable docu by me
faust3
parents:
13339
diff
changeset
|
334 extern int vo_gamma_gamma; |
0c41c3728568
fix ineffectual video equalizer command line options, patch by kiriuja <mplayer-bugs at en-directo.net>, closes #37, some more variable docu by me
faust3
parents:
13339
diff
changeset
|
335 extern int vo_gamma_brightness; |
0c41c3728568
fix ineffectual video equalizer command line options, patch by kiriuja <mplayer-bugs at en-directo.net>, closes #37, some more variable docu by me
faust3
parents:
13339
diff
changeset
|
336 extern int vo_gamma_contrast; |
0c41c3728568
fix ineffectual video equalizer command line options, patch by kiriuja <mplayer-bugs at en-directo.net>, closes #37, some more variable docu by me
faust3
parents:
13339
diff
changeset
|
337 extern int vo_gamma_saturation; |
0c41c3728568
fix ineffectual video equalizer command line options, patch by kiriuja <mplayer-bugs at en-directo.net>, closes #37, some more variable docu by me
faust3
parents:
13339
diff
changeset
|
338 extern int vo_gamma_hue; |
6781 | 339 |
6755 | 340 // --- |
341 | |
8198 | 342 #ifdef HAVE_MENU |
343 #include "m_struct.h" | |
344 #include "libmenu/menu.h" | |
345 extern void vf_menu_pause_update(struct vf_instance_s* vf); | |
346 extern vf_info_t vf_info_menu; | |
347 static vf_info_t* libmenu_vfs[] = { | |
348 &vf_info_menu, | |
349 NULL | |
350 }; | |
351 static vf_instance_t* vf_menu = NULL; | |
352 static int use_menu = 0; | |
353 static char* menu_cfg = NULL; | |
354 static char* menu_root = "main"; | |
355 #endif | |
356 | |
357 | |
5055 | 358 #ifdef HAVE_RTC |
7559
b645204ea527
some cleanup - made private vars/funcs static, removed obsolete externs
arpi
parents:
7529
diff
changeset
|
359 static int nortc; |
12681 | 360 static char* rtc_device; |
5055 | 361 #endif |
362 | |
8531
1aa2c9b460af
Merged EDL 0.5 patch - it's something like Quicktime's edit lists.
arpi
parents:
8494
diff
changeset
|
363 #ifdef USE_EDL |
13858
4178a4eee72c
fixed some doxygen comments, patch by Oded Shimon
reynaldo
parents:
13857
diff
changeset
|
364 edl_record_ptr edl_records = NULL; ///< EDL entries memory area |
4178a4eee72c
fixed some doxygen comments, patch by Oded Shimon
reynaldo
parents:
13857
diff
changeset
|
365 edl_record_ptr next_edl_record = NULL; ///< only for traversing edl_records |
13867 | 366 short user_muted = 0; ///< Stores whether User wanted muted mode. |
13882
8a928d5b42b8
Replaces edl_mute_count with togle making code more understandable, other trivial list suggested changes too, Patch by Oded Shimon
reynaldo
parents:
13868
diff
changeset
|
367 short edl_muted = 0; ///< Stores whether EDL is currently in muted mode. |
13858
4178a4eee72c
fixed some doxygen comments, patch by Oded Shimon
reynaldo
parents:
13857
diff
changeset
|
368 short edl_decision = 0; ///< 1 when an EDL operation has been made |
4178a4eee72c
fixed some doxygen comments, patch by Oded Shimon
reynaldo
parents:
13857
diff
changeset
|
369 FILE* edl_fd = NULL; ///< fd to write to when in -edlout mode |
8531
1aa2c9b460af
Merged EDL 0.5 patch - it's something like Quicktime's edit lists.
arpi
parents:
8494
diff
changeset
|
370 #endif |
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; |
373 #define INITED_VO 1 | |
374 #define INITED_AO 2 | |
375 #define INITED_GUI 4 | |
376 #define INITED_GETCH2 8 | |
3034
24d3dca4e813
DVD sub patch by Kim Minh Kaplan <kmkaplan@selfoffice.com>
arpi
parents:
3015
diff
changeset
|
377 #define INITED_SPUDEC 32 |
2321 | 378 #define INITED_STREAM 64 |
4431 | 379 #define INITED_INPUT 128 |
6110 | 380 #define INITED_VOBSUB 256 |
7621
7caeb275ad26
uninit cleanup again... thx to Nilmoni Deb for bugreport
arpi
parents:
7614
diff
changeset
|
381 #define INITED_DEMUXER 512 |
7caeb275ad26
uninit cleanup again... thx to Nilmoni Deb for bugreport
arpi
parents:
7614
diff
changeset
|
382 #define INITED_ACODEC 1024 |
7caeb275ad26
uninit cleanup again... thx to Nilmoni Deb for bugreport
arpi
parents:
7614
diff
changeset
|
383 #define INITED_VCODEC 2048 |
1856 | 384 #define INITED_ALL 0xFFFF |
385 | |
7559
b645204ea527
some cleanup - made private vars/funcs static, removed obsolete externs
arpi
parents:
7529
diff
changeset
|
386 static void uninit_player(unsigned int mask){ |
1856 | 387 mask=inited_flags&mask; |
5154 | 388 |
389 mp_msg(MSGT_CPLAYER,MSGL_DBG2,"\n*** uninit(0x%X)\n",mask); | |
390 | |
7621
7caeb275ad26
uninit cleanup again... thx to Nilmoni Deb for bugreport
arpi
parents:
7614
diff
changeset
|
391 if(mask&INITED_ACODEC){ |
7caeb275ad26
uninit cleanup again... thx to Nilmoni Deb for bugreport
arpi
parents:
7614
diff
changeset
|
392 inited_flags&=~INITED_ACODEC; |
7caeb275ad26
uninit cleanup again... thx to Nilmoni Deb for bugreport
arpi
parents:
7614
diff
changeset
|
393 current_module="uninit_acodec"; |
7caeb275ad26
uninit cleanup again... thx to Nilmoni Deb for bugreport
arpi
parents:
7614
diff
changeset
|
394 if(sh_audio) uninit_audio(sh_audio); |
14254 | 395 #ifdef HAVE_NEW_GUI |
396 guiGetEvent(guiSetAfilter, (char *)NULL); | |
397 #endif | |
7621
7caeb275ad26
uninit cleanup again... thx to Nilmoni Deb for bugreport
arpi
parents:
7614
diff
changeset
|
398 sh_audio=NULL; |
7caeb275ad26
uninit cleanup again... thx to Nilmoni Deb for bugreport
arpi
parents:
7614
diff
changeset
|
399 } |
7caeb275ad26
uninit cleanup again... thx to Nilmoni Deb for bugreport
arpi
parents:
7614
diff
changeset
|
400 |
7caeb275ad26
uninit cleanup again... thx to Nilmoni Deb for bugreport
arpi
parents:
7614
diff
changeset
|
401 if(mask&INITED_VCODEC){ |
7caeb275ad26
uninit cleanup again... thx to Nilmoni Deb for bugreport
arpi
parents:
7614
diff
changeset
|
402 inited_flags&=~INITED_VCODEC; |
7caeb275ad26
uninit cleanup again... thx to Nilmoni Deb for bugreport
arpi
parents:
7614
diff
changeset
|
403 current_module="uninit_vcodec"; |
7caeb275ad26
uninit cleanup again... thx to Nilmoni Deb for bugreport
arpi
parents:
7614
diff
changeset
|
404 if(sh_video) uninit_video(sh_video); |
7caeb275ad26
uninit cleanup again... thx to Nilmoni Deb for bugreport
arpi
parents:
7614
diff
changeset
|
405 sh_video=NULL; |
8198 | 406 #ifdef HAVE_MENU |
407 vf_menu=NULL; | |
408 #endif | |
7621
7caeb275ad26
uninit cleanup again... thx to Nilmoni Deb for bugreport
arpi
parents:
7614
diff
changeset
|
409 } |
7caeb275ad26
uninit cleanup again... thx to Nilmoni Deb for bugreport
arpi
parents:
7614
diff
changeset
|
410 |
7caeb275ad26
uninit cleanup again... thx to Nilmoni Deb for bugreport
arpi
parents:
7614
diff
changeset
|
411 if(mask&INITED_DEMUXER){ |
7caeb275ad26
uninit cleanup again... thx to Nilmoni Deb for bugreport
arpi
parents:
7614
diff
changeset
|
412 inited_flags&=~INITED_DEMUXER; |
7caeb275ad26
uninit cleanup again... thx to Nilmoni Deb for bugreport
arpi
parents:
7614
diff
changeset
|
413 current_module="free_demuxer"; |
8023 | 414 if(demuxer){ |
415 stream=demuxer->stream; | |
416 free_demuxer(demuxer); | |
417 } | |
7621
7caeb275ad26
uninit cleanup again... thx to Nilmoni Deb for bugreport
arpi
parents:
7614
diff
changeset
|
418 demuxer=NULL; |
7caeb275ad26
uninit cleanup again... thx to Nilmoni Deb for bugreport
arpi
parents:
7614
diff
changeset
|
419 } |
7caeb275ad26
uninit cleanup again... thx to Nilmoni Deb for bugreport
arpi
parents:
7614
diff
changeset
|
420 |
5830
4c17a92220fc
uninit libvo before getch2 - requires for clean svgalib uninit
arpi
parents:
5798
diff
changeset
|
421 // kill the cache process: |
5154 | 422 if(mask&INITED_STREAM){ |
423 inited_flags&=~INITED_STREAM; | |
424 current_module="uninit_stream"; | |
425 if(stream) free_stream(stream); | |
426 stream=NULL; | |
427 } | |
428 | |
5830
4c17a92220fc
uninit libvo before getch2 - requires for clean svgalib uninit
arpi
parents:
5798
diff
changeset
|
429 if(mask&INITED_VO){ |
4c17a92220fc
uninit libvo before getch2 - requires for clean svgalib uninit
arpi
parents:
5798
diff
changeset
|
430 inited_flags&=~INITED_VO; |
4c17a92220fc
uninit libvo before getch2 - requires for clean svgalib uninit
arpi
parents:
5798
diff
changeset
|
431 current_module="uninit_vo"; |
4c17a92220fc
uninit libvo before getch2 - requires for clean svgalib uninit
arpi
parents:
5798
diff
changeset
|
432 video_out->uninit(); |
4c17a92220fc
uninit libvo before getch2 - requires for clean svgalib uninit
arpi
parents:
5798
diff
changeset
|
433 video_out=NULL; |
4c17a92220fc
uninit libvo before getch2 - requires for clean svgalib uninit
arpi
parents:
5798
diff
changeset
|
434 } |
4c17a92220fc
uninit libvo before getch2 - requires for clean svgalib uninit
arpi
parents:
5798
diff
changeset
|
435 |
4c17a92220fc
uninit libvo before getch2 - requires for clean svgalib uninit
arpi
parents:
5798
diff
changeset
|
436 // must be after libvo uninit, as few vo drivers (svgalib) has tty code |
5154 | 437 if(mask&INITED_GETCH2){ |
438 inited_flags&=~INITED_GETCH2; | |
439 current_module="uninit_getch2"; | |
440 mp_msg(MSGT_CPLAYER,MSGL_DBG2,"\n[[[uninit getch2]]]\n"); | |
441 // restore terminal: | |
442 getch2_disable(); | |
443 } | |
444 | |
6110 | 445 if(mask&INITED_VOBSUB){ |
446 inited_flags&=~INITED_VOBSUB; | |
447 current_module="uninit_vobsub"; | |
7621
7caeb275ad26
uninit cleanup again... thx to Nilmoni Deb for bugreport
arpi
parents:
7614
diff
changeset
|
448 if(vo_vobsub) vobsub_close(vo_vobsub); |
6110 | 449 vo_vobsub=NULL; |
450 } | |
451 | |
3034
24d3dca4e813
DVD sub patch by Kim Minh Kaplan <kmkaplan@selfoffice.com>
arpi
parents:
3015
diff
changeset
|
452 if (mask&INITED_SPUDEC){ |
24d3dca4e813
DVD sub patch by Kim Minh Kaplan <kmkaplan@selfoffice.com>
arpi
parents:
3015
diff
changeset
|
453 inited_flags&=~INITED_SPUDEC; |
24d3dca4e813
DVD sub patch by Kim Minh Kaplan <kmkaplan@selfoffice.com>
arpi
parents:
3015
diff
changeset
|
454 current_module="uninit_spudec"; |
24d3dca4e813
DVD sub patch by Kim Minh Kaplan <kmkaplan@selfoffice.com>
arpi
parents:
3015
diff
changeset
|
455 spudec_free(vo_spudec); |
5411 | 456 vo_spudec=NULL; |
3034
24d3dca4e813
DVD sub patch by Kim Minh Kaplan <kmkaplan@selfoffice.com>
arpi
parents:
3015
diff
changeset
|
457 } |
5488
3f183ca22747
fixed SPU pts, it's 1024/90000 based instead of 1/100
arpi
parents:
5463
diff
changeset
|
458 |
1856 | 459 if(mask&INITED_AO){ |
460 inited_flags&=~INITED_AO; | |
461 current_module="uninit_ao"; | |
12332
6f5ae9f4eeb9
play the audio buffer in case of normal eof (i know the change is rude, but mplayer.c is hopelessly obfuscated)
alex
parents:
12306
diff
changeset
|
462 audio_out->uninit(eof?0:1); audio_out=NULL; |
1856 | 463 } |
464 | |
465 #ifdef HAVE_NEW_GUI | |
466 if(mask&INITED_GUI){ | |
467 inited_flags&=~INITED_GUI; | |
468 current_module="uninit_gui"; | |
4818
3473ca9ef158
new gui interface, and gtk moved into mplayer process. fork ... bleh :)
pontscho
parents:
4807
diff
changeset
|
469 guiDone(); |
1856 | 470 } |
471 #endif | |
472 | |
5830
4c17a92220fc
uninit libvo before getch2 - requires for clean svgalib uninit
arpi
parents:
5798
diff
changeset
|
473 if(mask&INITED_INPUT){ |
6429 | 474 inited_flags&=~INITED_INPUT; |
5830
4c17a92220fc
uninit libvo before getch2 - requires for clean svgalib uninit
arpi
parents:
5798
diff
changeset
|
475 current_module="uninit_input"; |
4c17a92220fc
uninit libvo before getch2 - requires for clean svgalib uninit
arpi
parents:
5798
diff
changeset
|
476 mp_input_uninit(); |
4c17a92220fc
uninit libvo before getch2 - requires for clean svgalib uninit
arpi
parents:
5798
diff
changeset
|
477 } |
4431 | 478 |
1863 | 479 current_module=NULL; |
1856 | 480 } |
481 | |
8644
0bfd73828e33
This patch fixes so that the exit code (or return code if you like) is set
arpi
parents:
8635
diff
changeset
|
482 static void exit_player_with_rc(char* how, int rc){ |
1156 | 483 |
1856 | 484 uninit_player(INITED_ALL); |
10661
49d7d02f4485
X11_FULLSCREEN vs HAVE_X11 definitions and some warning fixes
alex
parents:
10646
diff
changeset
|
485 #ifdef HAVE_X11 |
6016 | 486 #ifdef HAVE_NEW_GUI |
487 if ( !use_gui ) | |
488 #endif | |
6015 | 489 vo_uninit(); // close the X11 connection (if any opened) |
490 #endif | |
1723
5e4214a7540e
GUI stuff. now seeking works, and xmga renders to video window
arpi
parents:
1709
diff
changeset
|
491 |
13956
5d8f11a627ae
free freetype descriptor and library and mconfig data right before exit
iive
parents:
13946
diff
changeset
|
492 #ifdef HAVE_FREETYPE |
5d8f11a627ae
free freetype descriptor and library and mconfig data right before exit
iive
parents:
13946
diff
changeset
|
493 current_module="uninit_font"; |
5d8f11a627ae
free freetype descriptor and library and mconfig data right before exit
iive
parents:
13946
diff
changeset
|
494 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
|
495 vo_font = NULL; |
5d8f11a627ae
free freetype descriptor and library and mconfig data right before exit
iive
parents:
13946
diff
changeset
|
496 done_freetype(); |
5d8f11a627ae
free freetype descriptor and library and mconfig data right before exit
iive
parents:
13946
diff
changeset
|
497 #endif |
5d8f11a627ae
free freetype descriptor and library and mconfig data right before exit
iive
parents:
13946
diff
changeset
|
498 |
1856 | 499 current_module="exit_player"; |
1156 | 500 |
13956
5d8f11a627ae
free freetype descriptor and library and mconfig data right before exit
iive
parents:
13946
diff
changeset
|
501 // free mplayer config |
5d8f11a627ae
free freetype descriptor and library and mconfig data right before exit
iive
parents:
13946
diff
changeset
|
502 free(mconfig); |
5d8f11a627ae
free freetype descriptor and library and mconfig data right before exit
iive
parents:
13946
diff
changeset
|
503 |
13358
567875b88aab
Hardcoded EDL messages moved to help_mp-en.h, Doxygen comments added, patch
diego
parents:
13353
diff
changeset
|
504 #ifdef USE_EDL |
567875b88aab
Hardcoded EDL messages moved to help_mp-en.h, Doxygen comments added, patch
diego
parents:
13353
diff
changeset
|
505 if(edl_records != NULL) free(edl_records); // free mem allocated for EDL |
567875b88aab
Hardcoded EDL messages moved to help_mp-en.h, Doxygen comments added, patch
diego
parents:
13353
diff
changeset
|
506 #endif |
13122 | 507 if(how) mp_msg(MSGT_CPLAYER,MSGL_INFO,MSGTR_ExitingHow,mp_gettext(how)); |
4733
5bad0d74f6ea
standard key support for video out runtime fullscreen switching
alex
parents:
4693
diff
changeset
|
508 mp_msg(MSGT_CPLAYER,MSGL_DBG2,"max framesize was %d bytes\n",max_framesize); |
1639 | 509 |
8644
0bfd73828e33
This patch fixes so that the exit code (or return code if you like) is set
arpi
parents:
8635
diff
changeset
|
510 exit(rc); |
0bfd73828e33
This patch fixes so that the exit code (or return code if you like) is set
arpi
parents:
8635
diff
changeset
|
511 } |
0bfd73828e33
This patch fixes so that the exit code (or return code if you like) is set
arpi
parents:
8635
diff
changeset
|
512 |
0bfd73828e33
This patch fixes so that the exit code (or return code if you like) is set
arpi
parents:
8635
diff
changeset
|
513 void exit_player(char* how){ |
0bfd73828e33
This patch fixes so that the exit code (or return code if you like) is set
arpi
parents:
8635
diff
changeset
|
514 exit_player_with_rc(how, 1); |
1156 | 515 } |
516 | |
13391 | 517 #ifndef __MINGW32__ |
518 static void child_sighandler(int x){ | |
519 pid_t pid; | |
520 while((pid=waitpid(-1,NULL,WNOHANG)) > 0); | |
521 } | |
522 #endif | |
523 | |
13794 | 524 #ifdef CRASH_DEBUG |
525 static char *prog_path; | |
526 static int crash_debug = 0; | |
527 #endif | |
528 | |
7559
b645204ea527
some cleanup - made private vars/funcs static, removed obsolete externs
arpi
parents:
7529
diff
changeset
|
529 static void exit_sighandler(int x){ |
1156 | 530 static int sig_count=0; |
13794 | 531 #ifdef CRASH_DEBUG |
532 if (!crash_debug || x != SIGTRAP) | |
533 #endif | |
1156 | 534 ++sig_count; |
13298 | 535 if(inited_flags==0 && sig_count>1) exit(1); |
536 if(sig_count==5) | |
537 { | |
538 /* We're crashing bad and can't uninit cleanly :( | |
539 * by popular request, we make one last (dirty) | |
540 * effort to restore the user's | |
541 * terminal. */ | |
542 getch2_disable(); | |
543 exit(1); | |
544 } | |
545 if(sig_count==6) exit(1); | |
546 if(sig_count>6){ | |
1156 | 547 // can't stop :( |
9831 | 548 #ifndef __MINGW32__ |
1156 | 549 kill(getpid(),SIGKILL); |
9831 | 550 #endif |
1156 | 551 } |
5127 | 552 mp_msg(MSGT_CPLAYER,MSGL_FATAL,"\n" MSGTR_IntBySignal,x, |
5106 | 553 current_module?current_module:mp_gettext("unknown") |
1156 | 554 ); |
13794 | 555 if(sig_count<=1) |
5127 | 556 switch(x){ |
557 case SIGINT: | |
558 case SIGQUIT: | |
559 case SIGTERM: | |
560 case SIGKILL: | |
561 break; // killed from keyboard (^C) or killed [-9] | |
562 case SIGILL: | |
5129 | 563 #ifdef RUNTIME_CPUDETECT |
8913
f01a53c8de14
Signal handler messages moved to help_mp, so they can be translated
rtognimp
parents:
8819
diff
changeset
|
564 mp_msg(MSGT_CPLAYER,MSGL_FATAL,MSGTR_Exit_SIGILL_RTCpuSel); |
5129 | 565 #else |
8913
f01a53c8de14
Signal handler messages moved to help_mp, so they can be translated
rtognimp
parents:
8819
diff
changeset
|
566 mp_msg(MSGT_CPLAYER,MSGL_FATAL,MSGTR_Exit_SIGILL); |
5129 | 567 #endif |
5127 | 568 case SIGFPE: |
569 case SIGSEGV: | |
8913
f01a53c8de14
Signal handler messages moved to help_mp, so they can be translated
rtognimp
parents:
8819
diff
changeset
|
570 mp_msg(MSGT_CPLAYER,MSGL_FATAL,MSGTR_Exit_SIGSEGV_SIGFPE); |
5127 | 571 default: |
8913
f01a53c8de14
Signal handler messages moved to help_mp, so they can be translated
rtognimp
parents:
8819
diff
changeset
|
572 mp_msg(MSGT_CPLAYER,MSGL_FATAL,MSGTR_Exit_SIGCRASH); |
13794 | 573 #ifdef CRASH_DEBUG |
574 if (crash_debug) { | |
575 int gdb_pid; | |
576 char spid[20]; | |
577 snprintf(spid, 19, "%i", getpid()); | |
578 spid[19] = 0; | |
579 mp_msg(MSGT_CPLAYER, MSGL_INFO, "Forking...\n"); | |
580 gdb_pid = fork(); | |
581 mp_msg(MSGT_CPLAYER, MSGL_INFO, "Forked...\n"); | |
582 if (gdb_pid == 0) { // We are the child | |
583 if (execlp("gdb", "gdb", prog_path, spid, NULL) == -1) | |
584 mp_msg(MSGT_CPLAYER, MSGL_ERR, "Couldn't start gdb\n"); | |
585 } else if (gdb_pid < 0) | |
586 mp_msg(MSGT_CPLAYER, MSGL_ERR, "Couldn't fork\n"); | |
587 else { | |
588 waitpid(gdb_pid, NULL, 0); | |
589 } | |
590 if (x == SIGTRAP) return; | |
591 } | |
592 #endif | |
5127 | 593 } |
1156 | 594 exit_player(NULL); |
595 } | |
596 | |
2557 | 597 //extern void write_avi_header_1(FILE *f,int fcc,float fps,int width,int height); |
1439 | 598 |
7867 | 599 extern void mp_input_register_options(m_config_t* cfg); |
4659 | 600 |
459 | 601 #include "mixer.h" |
12691
0230544f52a1
Fix GUI compilation, patch by Reimar D«Óffinger and Alexander Strasser.
diego
parents:
12681
diff
changeset
|
602 mixer_t mixer; |
13098
907fe1fdfc6c
Make the stepsize of volume changes, changeable by a commandline paarameter
attila
parents:
13094
diff
changeset
|
603 /// step size of mixer changes |
907fe1fdfc6c
Make the stepsize of volume changes, changeable by a commandline paarameter
attila
parents:
13094
diff
changeset
|
604 int volstep = 3; |
12672
9709ce101949
New 'Mixer API' with ability to change volume through libaf (this part was written by Reimar Doffinger) and lesser global variables
alex
parents:
12550
diff
changeset
|
605 |
147 | 606 #include "cfg-mplayer.h" |
1 | 607 |
4156
22fadd4022b5
playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents:
4152
diff
changeset
|
608 void parse_cfgfiles( m_config_t* conf ) |
723 | 609 { |
1014
e01dc1a88edf
fixed punkso's mess... local variables moved back to main()
arpi_esp
parents:
1009
diff
changeset
|
610 char *conffile; |
e01dc1a88edf
fixed punkso's mess... local variables moved back to main()
arpi_esp
parents:
1009
diff
changeset
|
611 int conffile_fd; |
10272
7b0bc557987b
renames: DATADIR->MPLAYER_DATADIR, CONFDIR->MPLAYER_CONFDIR, LIBDIR->MPLAYER_LIBDIR
arpi
parents:
10240
diff
changeset
|
612 if (m_config_parse_config_file(conf, MPLAYER_CONFDIR "/mplayer.conf") < 0) |
13500 | 613 exit_player(NULL); |
178 | 614 if ((conffile = get_path("")) == NULL) { |
1583 | 615 mp_msg(MSGT_CPLAYER,MSGL_WARN,MSGTR_NoHomeDir); |
147 | 616 } else { |
9831 | 617 #ifdef __MINGW32__ |
618 mkdir(conffile); | |
619 #else | |
178 | 620 mkdir(conffile, 0777); |
9831 | 621 #endif |
178 | 622 free(conffile); |
623 if ((conffile = get_path("config")) == NULL) { | |
1583 | 624 mp_msg(MSGT_CPLAYER,MSGL_ERR,MSGTR_GetpathProblem); |
178 | 625 } else { |
626 if ((conffile_fd = open(conffile, O_CREAT | O_EXCL | O_WRONLY, 0666)) != -1) { | |
1582 | 627 mp_msg(MSGT_CPLAYER,MSGL_INFO,MSGTR_CreatingCfgFile, conffile); |
178 | 628 write(conffile_fd, default_config, strlen(default_config)); |
629 close(conffile_fd); | |
630 } | |
4156
22fadd4022b5
playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents:
4152
diff
changeset
|
631 if (m_config_parse_config_file(conf, conffile) < 0) |
13500 | 632 exit_player(NULL); |
178 | 633 free(conffile); |
151 | 634 } |
1 | 635 } |
636 } | |
637 | |
8614
49e36bf2f342
The patch adds support for a per-file config, which is loaded before
arpi
parents:
8612
diff
changeset
|
638 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
|
639 { |
49e36bf2f342
The patch adds support for a per-file config, which is loaded before
arpi
parents:
8612
diff
changeset
|
640 char *confpath; |
8634 | 641 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
|
642 struct stat st; |
49e36bf2f342
The patch adds support for a per-file config, which is loaded before
arpi
parents:
8612
diff
changeset
|
643 char *name; |
49e36bf2f342
The patch adds support for a per-file config, which is loaded before
arpi
parents:
8612
diff
changeset
|
644 |
49e36bf2f342
The patch adds support for a per-file config, which is loaded before
arpi
parents:
8612
diff
changeset
|
645 sprintf (cfg, "%s.conf", file); |
49e36bf2f342
The patch adds support for a per-file config, which is loaded before
arpi
parents:
8612
diff
changeset
|
646 |
49e36bf2f342
The patch adds support for a per-file config, which is loaded before
arpi
parents:
8612
diff
changeset
|
647 if (!stat (cfg, &st)) |
49e36bf2f342
The patch adds support for a per-file config, which is loaded before
arpi
parents:
8612
diff
changeset
|
648 { |
13577 | 649 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
|
650 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
|
651 return; |
49e36bf2f342
The patch adds support for a per-file config, which is loaded before
arpi
parents:
8612
diff
changeset
|
652 } |
49e36bf2f342
The patch adds support for a per-file config, which is loaded before
arpi
parents:
8612
diff
changeset
|
653 |
49e36bf2f342
The patch adds support for a per-file config, which is loaded before
arpi
parents:
8612
diff
changeset
|
654 if ((name = strrchr (cfg, '/')) == NULL) |
49e36bf2f342
The patch adds support for a per-file config, which is loaded before
arpi
parents:
8612
diff
changeset
|
655 name = cfg; |
49e36bf2f342
The patch adds support for a per-file config, which is loaded before
arpi
parents:
8612
diff
changeset
|
656 else |
49e36bf2f342
The patch adds support for a per-file config, which is loaded before
arpi
parents:
8612
diff
changeset
|
657 name++; |
49e36bf2f342
The patch adds support for a per-file config, which is loaded before
arpi
parents:
8612
diff
changeset
|
658 |
49e36bf2f342
The patch adds support for a per-file config, which is loaded before
arpi
parents:
8612
diff
changeset
|
659 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
|
660 { |
49e36bf2f342
The patch adds support for a per-file config, which is loaded before
arpi
parents:
8612
diff
changeset
|
661 if (!stat (confpath, &st)) |
49e36bf2f342
The patch adds support for a per-file config, which is loaded before
arpi
parents:
8612
diff
changeset
|
662 { |
13577 | 663 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
|
664 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
|
665 } |
49e36bf2f342
The patch adds support for a per-file config, which is loaded before
arpi
parents:
8612
diff
changeset
|
666 |
49e36bf2f342
The patch adds support for a per-file config, which is loaded before
arpi
parents:
8612
diff
changeset
|
667 free (confpath); |
49e36bf2f342
The patch adds support for a per-file config, which is loaded before
arpi
parents:
8612
diff
changeset
|
668 } |
49e36bf2f342
The patch adds support for a per-file config, which is loaded before
arpi
parents:
8612
diff
changeset
|
669 } |
49e36bf2f342
The patch adds support for a per-file config, which is loaded before
arpi
parents:
8612
diff
changeset
|
670 |
4825
41d2da3bd082
Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents:
4818
diff
changeset
|
671 // When libmpdemux perform a blocking operation (network connection or cache filling) |
41d2da3bd082
Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents:
4818
diff
changeset
|
672 // if the operation fail we use this function to check if it was interrupted by the user. |
41d2da3bd082
Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents:
4818
diff
changeset
|
673 // The function return a new value for eof. |
41d2da3bd082
Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents:
4818
diff
changeset
|
674 static int libmpdemux_was_interrupted(int eof) { |
41d2da3bd082
Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents:
4818
diff
changeset
|
675 mp_cmd_t* cmd; |
13603 | 676 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
|
677 switch(cmd->id) { |
41d2da3bd082
Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents:
4818
diff
changeset
|
678 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
|
679 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
|
680 case MP_CMD_PLAY_TREE_STEP: { |
41d2da3bd082
Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents:
4818
diff
changeset
|
681 eof = (cmd->args[0].v.i > 0) ? PT_NEXT_ENTRY : PT_PREV_ENTRY; |
41d2da3bd082
Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents:
4818
diff
changeset
|
682 } break; |
41d2da3bd082
Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents:
4818
diff
changeset
|
683 case MP_CMD_PLAY_TREE_UP_STEP: { |
41d2da3bd082
Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents:
4818
diff
changeset
|
684 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
|
685 } break; |
41d2da3bd082
Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents:
4818
diff
changeset
|
686 case MP_CMD_PLAY_ALT_SRC_STEP: { |
41d2da3bd082
Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents:
4818
diff
changeset
|
687 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
|
688 } break; |
41d2da3bd082
Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents:
4818
diff
changeset
|
689 } |
41d2da3bd082
Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents:
4818
diff
changeset
|
690 mp_cmd_free(cmd); |
41d2da3bd082
Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents:
4818
diff
changeset
|
691 } |
41d2da3bd082
Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents:
4818
diff
changeset
|
692 return eof; |
41d2da3bd082
Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents:
4818
diff
changeset
|
693 } |
41d2da3bd082
Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents:
4818
diff
changeset
|
694 |
13010 | 695 #define mp_basename2(s) (strrchr(s,'/')==NULL?(char*)s:(strrchr(s,'/')+1)) |
696 #define mp_basename(s) (strrchr(s,'\\')==NULL?(mp_basename2(s)):(strrchr(s,'\\')+1)) | |
8937 | 697 |
8925
5c15777f1c07
this patch adds an fallback to playlist (any but the plaintext-list format)
arpi
parents:
8913
diff
changeset
|
698 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
|
699 { |
9301
7841308ad250
this patch fixes latest bug, discovered by .so ... (relative filenames &
arpi
parents:
9291
diff
changeset
|
700 play_tree_add_bpf(entry,filename); |
7841308ad250
this patch fixes latest bug, discovered by .so ... (relative filenames &
arpi
parents:
9291
diff
changeset
|
701 |
9291
64b8c5a07c2c
- It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents:
9217
diff
changeset
|
702 #ifdef HAVE_NEW_GUI |
64b8c5a07c2c
- It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents:
9217
diff
changeset
|
703 if (use_gui) { |
64b8c5a07c2c
- It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents:
9217
diff
changeset
|
704 if (entry) { |
64b8c5a07c2c
- It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents:
9217
diff
changeset
|
705 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
|
706 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
|
707 } |
64b8c5a07c2c
- It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents:
9217
diff
changeset
|
708 } else |
64b8c5a07c2c
- It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents:
9217
diff
changeset
|
709 #endif |
64b8c5a07c2c
- It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents:
9217
diff
changeset
|
710 { |
8925
5c15777f1c07
this patch adds an fallback to playlist (any but the plaintext-list format)
arpi
parents:
8913
diff
changeset
|
711 if(!entry) { |
5c15777f1c07
this patch adds an fallback to playlist (any but the plaintext-list format)
arpi
parents:
8913
diff
changeset
|
712 entry = playtree_iter->tree; |
5c15777f1c07
this patch adds an fallback to playlist (any but the plaintext-list format)
arpi
parents:
8913
diff
changeset
|
713 if(play_tree_iter_step(playtree_iter,1,0) != PLAY_TREE_ITER_ENTRY) { |
5c15777f1c07
this patch adds an fallback to playlist (any but the plaintext-list format)
arpi
parents:
8913
diff
changeset
|
714 return PT_NEXT_ENTRY; |
5c15777f1c07
this patch adds an fallback to playlist (any but the plaintext-list format)
arpi
parents:
8913
diff
changeset
|
715 } |
5c15777f1c07
this patch adds an fallback to playlist (any but the plaintext-list format)
arpi
parents:
8913
diff
changeset
|
716 if(playtree_iter->tree == entry ) { // Loop with a single file |
5c15777f1c07
this patch adds an fallback to playlist (any but the plaintext-list format)
arpi
parents:
8913
diff
changeset
|
717 if(play_tree_iter_up_step(playtree_iter,1,0) != PLAY_TREE_ITER_ENTRY) { |
5c15777f1c07
this patch adds an fallback to playlist (any but the plaintext-list format)
arpi
parents:
8913
diff
changeset
|
718 return PT_NEXT_ENTRY; |
5c15777f1c07
this patch adds an fallback to playlist (any but the plaintext-list format)
arpi
parents:
8913
diff
changeset
|
719 } |
5c15777f1c07
this patch adds an fallback to playlist (any but the plaintext-list format)
arpi
parents:
8913
diff
changeset
|
720 } |
5c15777f1c07
this patch adds an fallback to playlist (any but the plaintext-list format)
arpi
parents:
8913
diff
changeset
|
721 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
|
722 return PT_NEXT_SRC; |
5c15777f1c07
this patch adds an fallback to playlist (any but the plaintext-list format)
arpi
parents:
8913
diff
changeset
|
723 } |
5c15777f1c07
this patch adds an fallback to playlist (any but the plaintext-list format)
arpi
parents:
8913
diff
changeset
|
724 play_tree_insert_entry(playtree_iter->tree,entry); |
5c15777f1c07
this patch adds an fallback to playlist (any but the plaintext-list format)
arpi
parents:
8913
diff
changeset
|
725 play_tree_set_params_from(entry,playtree_iter->tree); |
5c15777f1c07
this patch adds an fallback to playlist (any but the plaintext-list format)
arpi
parents:
8913
diff
changeset
|
726 entry = playtree_iter->tree; |
5c15777f1c07
this patch adds an fallback to playlist (any but the plaintext-list format)
arpi
parents:
8913
diff
changeset
|
727 if(play_tree_iter_step(playtree_iter,1,0) != PLAY_TREE_ITER_ENTRY) { |
5c15777f1c07
this patch adds an fallback to playlist (any but the plaintext-list format)
arpi
parents:
8913
diff
changeset
|
728 return PT_NEXT_ENTRY; |
5c15777f1c07
this patch adds an fallback to playlist (any but the plaintext-list format)
arpi
parents:
8913
diff
changeset
|
729 } |
5c15777f1c07
this patch adds an fallback to playlist (any but the plaintext-list format)
arpi
parents:
8913
diff
changeset
|
730 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
|
731 } |
8925
5c15777f1c07
this patch adds an fallback to playlist (any but the plaintext-list format)
arpi
parents:
8913
diff
changeset
|
732 return PT_NEXT_SRC; |
5c15777f1c07
this patch adds an fallback to playlist (any but the plaintext-list format)
arpi
parents:
8913
diff
changeset
|
733 } |
5c15777f1c07
this patch adds an fallback to playlist (any but the plaintext-list format)
arpi
parents:
8913
diff
changeset
|
734 |
8198 | 735 static int play_tree_step = 1; |
736 | |
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
|
737 int sub_source() |
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
|
738 { |
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
|
739 int source = -1; |
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
|
740 int top = -1; |
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
|
741 int i; |
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
|
742 for (i = 0; i < SUB_SOURCES; i++) { |
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
|
743 int j = global_sub_indices[i]; |
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
|
744 if ((j >= 0) && (j > top) && (global_sub_pos >= j)) { |
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
|
745 source = i; |
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
|
746 top = j; |
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
|
747 } |
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
|
748 } |
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
|
749 return source; |
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
|
750 } |
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
|
751 |
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9831
diff
changeset
|
752 #ifdef USE_SUB |
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9831
diff
changeset
|
753 |
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9831
diff
changeset
|
754 sub_data* subdata = NULL; |
14684 | 755 static subtitle* vo_sub_last = NULL; |
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9831
diff
changeset
|
756 |
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9831
diff
changeset
|
757 void add_subtitles(char *filename, float fps, int silent) |
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9831
diff
changeset
|
758 { |
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9831
diff
changeset
|
759 sub_data *subd; |
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9831
diff
changeset
|
760 |
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9831
diff
changeset
|
761 if (filename == NULL) { |
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9831
diff
changeset
|
762 return; |
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9831
diff
changeset
|
763 } |
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9831
diff
changeset
|
764 |
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9831
diff
changeset
|
765 subd = sub_read_file(filename, fps); |
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9831
diff
changeset
|
766 if(!subd && !silent) |
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9831
diff
changeset
|
767 mp_msg(MSGT_CPLAYER, MSGL_ERR, MSGTR_CantLoadSub, filename); |
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9831
diff
changeset
|
768 if (subd == NULL || set_of_sub_size >= MAX_SUBTITLE_FILES) return; |
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9831
diff
changeset
|
769 set_of_subtitles[set_of_sub_size] = subd; |
14046
4802041ab8e3
Output more information about vids, aids, sids, alangs and slangs with -identify. Patch by kiriuja <mplayer-patches@en-directo.net>
mosu
parents:
13991
diff
changeset
|
770 if (identify) |
4802041ab8e3
Output more information about vids, aids, sids, alangs and slangs with -identify. Patch by kiriuja <mplayer-patches@en-directo.net>
mosu
parents:
13991
diff
changeset
|
771 { |
4802041ab8e3
Output more information about vids, aids, sids, alangs and slangs with -identify. Patch by kiriuja <mplayer-patches@en-directo.net>
mosu
parents:
13991
diff
changeset
|
772 mp_msg(MSGT_GLOBAL, MSGL_INFO, "ID_FILE_SUB_ID=%d\n", set_of_sub_size); |
4802041ab8e3
Output more information about vids, aids, sids, alangs and slangs with -identify. Patch by kiriuja <mplayer-patches@en-directo.net>
mosu
parents:
13991
diff
changeset
|
773 mp_msg(MSGT_GLOBAL, MSGL_INFO, "ID_FILE_SUB_FILENAME=%s\n", filename); |
4802041ab8e3
Output more information about vids, aids, sids, alangs and slangs with -identify. Patch by kiriuja <mplayer-patches@en-directo.net>
mosu
parents:
13991
diff
changeset
|
774 } |
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9831
diff
changeset
|
775 ++set_of_sub_size; |
14241
ad4dd100472e
Set message level of the added subtitle message to INFO, fixes bug #139
reimar
parents:
14197
diff
changeset
|
776 mp_msg(MSGT_CPLAYER, MSGL_INFO, MSGTR_AddedSubtitleFile, set_of_sub_size, filename); |
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9831
diff
changeset
|
777 } |
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9831
diff
changeset
|
778 |
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
|
779 // FIXME: if/when the GUI calls this, global sub numbering gets (potentially) broken. |
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9831
diff
changeset
|
780 void update_set_of_subtitles() |
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9831
diff
changeset
|
781 // 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
|
782 { |
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9831
diff
changeset
|
783 int i; |
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9831
diff
changeset
|
784 if (set_of_sub_size > 0 && subdata == NULL) { // *subdata was deleted |
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9831
diff
changeset
|
785 for (i = set_of_sub_pos + 1; i < set_of_sub_size; ++i) |
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9831
diff
changeset
|
786 set_of_subtitles[i-1] = set_of_subtitles[i]; |
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9831
diff
changeset
|
787 set_of_subtitles[set_of_sub_size-1] = NULL; |
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9831
diff
changeset
|
788 --set_of_sub_size; |
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9831
diff
changeset
|
789 if (set_of_sub_size > 0) subdata = set_of_subtitles[set_of_sub_pos=0]; |
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9831
diff
changeset
|
790 } |
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9831
diff
changeset
|
791 else if (set_of_sub_size > 0 && subdata != NULL) { // *subdata was changed |
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9831
diff
changeset
|
792 set_of_subtitles[set_of_sub_pos] = subdata; |
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9831
diff
changeset
|
793 } |
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9831
diff
changeset
|
794 else if (set_of_sub_size <= 0 && subdata != NULL) { // *subdata was added |
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9831
diff
changeset
|
795 set_of_subtitles[set_of_sub_pos=set_of_sub_size] = subdata; |
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9831
diff
changeset
|
796 ++set_of_sub_size; |
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9831
diff
changeset
|
797 } |
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9831
diff
changeset
|
798 } |
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9831
diff
changeset
|
799 #endif |
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9831
diff
changeset
|
800 |
7201
22beff6edf75
Improved MacOS X SDL support, enable SDL main() wrapper for Darwin, remove unused envp.
atmos4
parents:
7191
diff
changeset
|
801 /* |
22beff6edf75
Improved MacOS X SDL support, enable SDL main() wrapper for Darwin, remove unused envp.
atmos4
parents:
7191
diff
changeset
|
802 * 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
|
803 * 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
|
804 * 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
|
805 */ |
22beff6edf75
Improved MacOS X SDL support, enable SDL main() wrapper for Darwin, remove unused envp.
atmos4
parents:
7191
diff
changeset
|
806 #if defined(SYS_DARWIN) && defined(HAVE_SDL) |
22beff6edf75
Improved MacOS X SDL support, enable SDL main() wrapper for Darwin, remove unused envp.
atmos4
parents:
7191
diff
changeset
|
807 #include <SDL.h> |
22beff6edf75
Improved MacOS X SDL support, enable SDL main() wrapper for Darwin, remove unused envp.
atmos4
parents:
7191
diff
changeset
|
808 #endif |
22beff6edf75
Improved MacOS X SDL support, enable SDL main() wrapper for Darwin, remove unused envp.
atmos4
parents:
7191
diff
changeset
|
809 |
13710 | 810 /** |
13857
38424a8eb0ea
reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents:
13794
diff
changeset
|
811 * \brief append a formatted string |
38424a8eb0ea
reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents:
13794
diff
changeset
|
812 * \param buf buffer to print into |
38424a8eb0ea
reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents:
13794
diff
changeset
|
813 * \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
|
814 * \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
|
815 * \param format printf format string |
38424a8eb0ea
reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents:
13794
diff
changeset
|
816 */ |
38424a8eb0ea
reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents:
13794
diff
changeset
|
817 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
|
818 { |
38424a8eb0ea
reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents:
13794
diff
changeset
|
819 va_list va; |
38424a8eb0ea
reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents:
13794
diff
changeset
|
820 va_start(va, format); |
38424a8eb0ea
reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents:
13794
diff
changeset
|
821 *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
|
822 va_end(va); |
38424a8eb0ea
reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents:
13794
diff
changeset
|
823 if (*pos >= len ) { |
38424a8eb0ea
reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents:
13794
diff
changeset
|
824 buf[len] = 0; |
38424a8eb0ea
reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents:
13794
diff
changeset
|
825 *pos = len; |
38424a8eb0ea
reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents:
13794
diff
changeset
|
826 } |
38424a8eb0ea
reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents:
13794
diff
changeset
|
827 } |
38424a8eb0ea
reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents:
13794
diff
changeset
|
828 |
38424a8eb0ea
reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents:
13794
diff
changeset
|
829 /** |
38424a8eb0ea
reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents:
13794
diff
changeset
|
830 * \brief print the status line |
38424a8eb0ea
reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents:
13794
diff
changeset
|
831 * \param a_pos audio position |
38424a8eb0ea
reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents:
13794
diff
changeset
|
832 * \param a_v A-V desynchronization |
38424a8eb0ea
reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents:
13794
diff
changeset
|
833 * \param corr amount out A-V synchronization |
38424a8eb0ea
reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents:
13794
diff
changeset
|
834 */ |
38424a8eb0ea
reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents:
13794
diff
changeset
|
835 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
|
836 { |
38424a8eb0ea
reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents:
13794
diff
changeset
|
837 int width; |
38424a8eb0ea
reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents:
13794
diff
changeset
|
838 char *line; |
38424a8eb0ea
reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents:
13794
diff
changeset
|
839 unsigned pos = 0; |
13906
db2f1e657dfe
use get_screen_size from getch2.c instead of ioctl, fixes bug #131.
reimar
parents:
13893
diff
changeset
|
840 get_screen_size(); |
db2f1e657dfe
use get_screen_size from getch2.c instead of ioctl, fixes bug #131.
reimar
parents:
13893
diff
changeset
|
841 if (screen_width > 0) |
db2f1e657dfe
use get_screen_size from getch2.c instead of ioctl, fixes bug #131.
reimar
parents:
13893
diff
changeset
|
842 width = screen_width; |
13857
38424a8eb0ea
reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents:
13794
diff
changeset
|
843 else |
38424a8eb0ea
reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents:
13794
diff
changeset
|
844 width = 80; |
13928 | 845 #ifdef WIN32 |
846 // windows command line is broken (MinGW's rxvt works though, but we | |
847 // should not depend on that). | |
848 width--; | |
849 #endif | |
13857
38424a8eb0ea
reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents:
13794
diff
changeset
|
850 line = malloc(width + 1); // one additional for terminating null |
38424a8eb0ea
reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents:
13794
diff
changeset
|
851 |
38424a8eb0ea
reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents:
13794
diff
changeset
|
852 // Audio time |
38424a8eb0ea
reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents:
13794
diff
changeset
|
853 if (sh_audio) { |
38424a8eb0ea
reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents:
13794
diff
changeset
|
854 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
|
855 if (!sh_video) { |
38424a8eb0ea
reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents:
13794
diff
changeset
|
856 // convert time to HH:MM:SS.F format |
38424a8eb0ea
reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents:
13794
diff
changeset
|
857 long tenths = 10 * a_pos; |
38424a8eb0ea
reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents:
13794
diff
changeset
|
858 int f1 = tenths % 10; |
38424a8eb0ea
reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents:
13794
diff
changeset
|
859 int ss = (tenths / 10) % 60; |
38424a8eb0ea
reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents:
13794
diff
changeset
|
860 int mm = (tenths / 600) % 60; |
38424a8eb0ea
reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents:
13794
diff
changeset
|
861 int hh = (tenths / 36000) % 100; |
38424a8eb0ea
reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents:
13794
diff
changeset
|
862 saddf(line, &pos, width, "("); |
38424a8eb0ea
reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents:
13794
diff
changeset
|
863 if (hh > 0) |
38424a8eb0ea
reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents:
13794
diff
changeset
|
864 saddf(line, &pos, width, "%2d:", hh); |
38424a8eb0ea
reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents:
13794
diff
changeset
|
865 if (hh > 0 || mm > 0) |
38424a8eb0ea
reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents:
13794
diff
changeset
|
866 saddf(line, &pos, width, "%02d:", mm); |
38424a8eb0ea
reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents:
13794
diff
changeset
|
867 saddf(line, &pos, width, "%02d.", ss); |
38424a8eb0ea
reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents:
13794
diff
changeset
|
868 saddf(line, &pos, width, "%1d", f1); |
38424a8eb0ea
reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents:
13794
diff
changeset
|
869 saddf(line, &pos, width, ") "); |
38424a8eb0ea
reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents:
13794
diff
changeset
|
870 } |
38424a8eb0ea
reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents:
13794
diff
changeset
|
871 } |
38424a8eb0ea
reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents:
13794
diff
changeset
|
872 |
38424a8eb0ea
reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents:
13794
diff
changeset
|
873 // Video time |
38424a8eb0ea
reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents:
13794
diff
changeset
|
874 if (sh_video) |
38424a8eb0ea
reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents:
13794
diff
changeset
|
875 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
|
876 |
38424a8eb0ea
reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents:
13794
diff
changeset
|
877 // A-V sync |
38424a8eb0ea
reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents:
13794
diff
changeset
|
878 if (sh_audio && sh_video) |
38424a8eb0ea
reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents:
13794
diff
changeset
|
879 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
|
880 |
38424a8eb0ea
reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents:
13794
diff
changeset
|
881 // Video stats |
38424a8eb0ea
reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents:
13794
diff
changeset
|
882 if (sh_video) |
38424a8eb0ea
reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents:
13794
diff
changeset
|
883 saddf(line, &pos, width, "%3d/%3d ", |
38424a8eb0ea
reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents:
13794
diff
changeset
|
884 (int)sh_video->num_frames, |
38424a8eb0ea
reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents:
13794
diff
changeset
|
885 (int)sh_video->num_frames_decoded); |
38424a8eb0ea
reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents:
13794
diff
changeset
|
886 |
38424a8eb0ea
reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents:
13794
diff
changeset
|
887 // CPU usage |
38424a8eb0ea
reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents:
13794
diff
changeset
|
888 if (sh_video) { |
38424a8eb0ea
reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents:
13794
diff
changeset
|
889 if (sh_video->timer > 0.5) |
38424a8eb0ea
reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents:
13794
diff
changeset
|
890 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
|
891 (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
|
892 (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
|
893 (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
|
894 else |
38424a8eb0ea
reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents:
13794
diff
changeset
|
895 saddf(line, &pos, width, "??%% ??%% ??,?%% "); |
38424a8eb0ea
reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents:
13794
diff
changeset
|
896 } else if (sh_audio) { |
38424a8eb0ea
reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents:
13794
diff
changeset
|
897 if (sh_audio->delay > 0.5) |
38424a8eb0ea
reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents:
13794
diff
changeset
|
898 saddf(line, &pos, width, "%4.1f%% ", |
38424a8eb0ea
reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents:
13794
diff
changeset
|
899 100.0*audio_time_usage/(double)sh_audio->delay); |
38424a8eb0ea
reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents:
13794
diff
changeset
|
900 else |
38424a8eb0ea
reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents:
13794
diff
changeset
|
901 saddf(line, &pos, width, "??,?%% "); |
38424a8eb0ea
reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents:
13794
diff
changeset
|
902 } |
38424a8eb0ea
reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents:
13794
diff
changeset
|
903 |
38424a8eb0ea
reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents:
13794
diff
changeset
|
904 // VO stats |
38424a8eb0ea
reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents:
13794
diff
changeset
|
905 if (sh_video) |
38424a8eb0ea
reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents:
13794
diff
changeset
|
906 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
|
907 |
38424a8eb0ea
reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents:
13794
diff
changeset
|
908 #ifdef USE_STREAM_CACHE |
38424a8eb0ea
reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents:
13794
diff
changeset
|
909 // cache stats |
38424a8eb0ea
reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents:
13794
diff
changeset
|
910 if (stream_cache_size > 0) |
38424a8eb0ea
reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents:
13794
diff
changeset
|
911 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
|
912 #endif |
38424a8eb0ea
reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents:
13794
diff
changeset
|
913 |
38424a8eb0ea
reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents:
13794
diff
changeset
|
914 // other |
38424a8eb0ea
reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents:
13794
diff
changeset
|
915 if (playback_speed != 1) |
38424a8eb0ea
reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents:
13794
diff
changeset
|
916 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
|
917 |
38424a8eb0ea
reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents:
13794
diff
changeset
|
918 // end |
38424a8eb0ea
reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents:
13794
diff
changeset
|
919 memset(&line[pos], ' ', width - pos); |
38424a8eb0ea
reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents:
13794
diff
changeset
|
920 line[width] = 0; |
38424a8eb0ea
reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents:
13794
diff
changeset
|
921 mp_msg(MSGT_AVSYNC, MSGL_STATUS, "%s\r", line); |
38424a8eb0ea
reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents:
13794
diff
changeset
|
922 free(line); |
38424a8eb0ea
reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents:
13794
diff
changeset
|
923 } |
38424a8eb0ea
reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents:
13794
diff
changeset
|
924 |
38424a8eb0ea
reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents:
13794
diff
changeset
|
925 /** |
13710 | 926 * \brief build a chain of audio filters that converts the input format |
927 * to the ao's format, taking into account the current playback_speed. | |
928 * \param sh_audio describes the requested input format of the chain. | |
929 * \param ao_data describes the requested output format of the chain. | |
930 */ | |
931 static int build_afilter_chain(sh_audio_t *sh_audio, ao_data_t *ao_data) | |
932 { | |
14140
337aa26e20b5
10l, should check for != NULL before using not after...
reimar
parents:
14087
diff
changeset
|
933 int new_srate; |
14172 | 934 int result; |
13710 | 935 if (!sh_audio) |
14172 | 936 { |
14254 | 937 #ifdef HAVE_NEW_GUI |
938 guiGetEvent(guiSetAfilter, (char *)NULL); | |
939 #endif | |
14172 | 940 mixer.afilter = NULL; |
13710 | 941 return 0; |
14172 | 942 } |
14140
337aa26e20b5
10l, should check for != NULL before using not after...
reimar
parents:
14087
diff
changeset
|
943 new_srate = sh_audio->samplerate * playback_speed; |
13710 | 944 if (new_srate != ao_data->samplerate) { |
945 // limits are taken from libaf/af_resample.c | |
946 if (new_srate < 8000) | |
947 new_srate = 8000; | |
948 if (new_srate > 192000) | |
949 new_srate = 192000; | |
950 playback_speed = (float)new_srate / (float)sh_audio->samplerate; | |
951 } | |
14172 | 952 result = init_audio_filters(sh_audio, new_srate, |
13710 | 953 sh_audio->channels, sh_audio->sample_format, sh_audio->samplesize, |
954 ao_data->samplerate, ao_data->channels, ao_data->format, | |
14245 | 955 af_fmt2bits(ao_data->format) / 8, /* ao_data.bps, */ |
13710 | 956 ao_data->outburst * 4, ao_data->buffersize); |
14172 | 957 mixer.afilter = sh_audio->afilter; |
14254 | 958 #ifdef HAVE_NEW_GUI |
959 guiGetEvent(guiSetAfilter, (char *)sh_audio->afilter); | |
960 #endif | |
14172 | 961 return result; |
13710 | 962 } |
8800 | 963 |
14684 | 964 #ifdef USE_SUB |
965 /** | |
966 * \brief Log the currently displayed subtitle to a file | |
967 * | |
968 * Logs the current or last displayed subtitle together with filename | |
969 * and time information to ~/.mplayer/subtitle_log | |
970 * | |
971 * Intended purpose is to allow convenient marking of bogus subtitles | |
972 * which need to be fixed while watching the movie. | |
973 */ | |
974 | |
975 static void log_sub(){ | |
976 char *fname; | |
977 FILE *f; | |
978 int i; | |
979 | |
980 if (subdata == NULL || vo_sub_last == NULL) return; | |
981 fname = get_path("subtitle_log"); | |
982 f = fopen(fname, "a"); | |
983 if (!f) return; | |
984 fprintf(f, "----------------------------------------------------------\n"); | |
985 if (subdata->sub_uses_time) { | |
986 fprintf(f, "N: %s S: %02d:%02d:%02d.%02d E: %02d:%02d:%02d.%02d\n", filename, | |
987 vo_sub_last->start/360000, (vo_sub_last->start/6000)%60, | |
988 (vo_sub_last->start/100)%60, vo_sub_last->start%100, | |
989 vo_sub_last->end/360000, (vo_sub_last->end/6000)%60, | |
990 (vo_sub_last->end/100)%60, vo_sub_last->end%100); | |
991 } else { | |
992 fprintf(f, "N: %s S: %d E: %d\n", filename, vo_sub_last->start, vo_sub_last->end); | |
993 } | |
994 for (i = 0; i < vo_sub_last->lines; i++) { | |
995 fprintf(f, "%s\n", vo_sub_last->text[i]); | |
996 } | |
997 fclose(f); | |
998 } | |
999 #endif | |
1000 | |
7201
22beff6edf75
Improved MacOS X SDL support, enable SDL main() wrapper for Darwin, remove unused envp.
atmos4
parents:
7191
diff
changeset
|
1001 int main(int argc,char* argv[]){ |
22beff6edf75
Improved MacOS X SDL support, enable SDL main() wrapper for Darwin, remove unused envp.
atmos4
parents:
7191
diff
changeset
|
1002 |
723 | 1003 |
12890 | 1004 char * mem_ptr; |
1289 | 1005 |
1006 static demux_stream_t *d_audio=NULL; | |
1007 static demux_stream_t *d_video=NULL; | |
1008 static demux_stream_t *d_dvdsub=NULL; | |
1009 | |
1014
e01dc1a88edf
fixed punkso's mess... local variables moved back to main()
arpi_esp
parents:
1009
diff
changeset
|
1010 int file_format=DEMUXER_TYPE_UNKNOWN; |
4156
22fadd4022b5
playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents:
4152
diff
changeset
|
1011 |
1014
e01dc1a88edf
fixed punkso's mess... local variables moved back to main()
arpi_esp
parents:
1009
diff
changeset
|
1012 int delay_corrected=1; |
e01dc1a88edf
fixed punkso's mess... local variables moved back to main()
arpi_esp
parents:
1009
diff
changeset
|
1013 |
e01dc1a88edf
fixed punkso's mess... local variables moved back to main()
arpi_esp
parents:
1009
diff
changeset
|
1014 // movie info: |
e01dc1a88edf
fixed punkso's mess... local variables moved back to main()
arpi_esp
parents:
1009
diff
changeset
|
1015 |
e01dc1a88edf
fixed punkso's mess... local variables moved back to main()
arpi_esp
parents:
1009
diff
changeset
|
1016 int osd_function=OSD_PLAY; |
e01dc1a88edf
fixed punkso's mess... local variables moved back to main()
arpi_esp
parents:
1009
diff
changeset
|
1017 int osd_last_pts=-303; |
3783 | 1018 int osd_show_av_delay = 0; |
10116
add63fea61ac
new slave mode command to show text via osd, patch by Lars Gemeinhardt <lars.gemeinhardt at searchbroker.de> (reviewed by albeu)
faust3
parents:
10053
diff
changeset
|
1019 int osd_show_text = 0; |
13710 | 1020 int osd_show_speed = 0; |
3234
d1e891c1e548
dusplay sub_delay patch by Evgeny Chukreev <codedj@echo.ru>
arpi
parents:
3201
diff
changeset
|
1021 int osd_show_sub_delay = 0; |
8366
3e3b30d16719
With this patch the text 'Sub position: x/100' is displayed
arpi
parents:
8365
diff
changeset
|
1022 int osd_show_sub_pos = 0; |
7628
d6608342591d
This patch adds the functionality to disable/enable subtitles while playing
arpi
parents:
7621
diff
changeset
|
1023 int osd_show_sub_visibility = 0; |
8534
922ce27eb683
This patch adds support for vertical subtitle alignment
arpi
parents:
8531
diff
changeset
|
1024 int osd_show_sub_alignment = 0; |
7780
9806d65986e4
Mplayer can switch between subtitles of different languages during
kmkaplan
parents:
7751
diff
changeset
|
1025 int osd_show_vobsub_changed = 0; |
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9831
diff
changeset
|
1026 int osd_show_sub_changed = 0; |
8612
a61d1b326beb
It shows not just the progressbar, but progressbar /and/ percentage
arpi
parents:
8606
diff
changeset
|
1027 int osd_show_percentage = 0; |
8627
14ab71b47a58
user friendly channel tuning + 10L fix in tvi_v4l (by Stephane Jourdois)
henry
parents:
8619
diff
changeset
|
1028 int osd_show_tv_channel = 25; |
11542 | 1029 int osd_show_ontop = 0; |
13091 | 1030 int osd_show_rootwin = 0; |
11936 | 1031 int osd_show_framedropping = 0; |
1014
e01dc1a88edf
fixed punkso's mess... local variables moved back to main()
arpi_esp
parents:
1009
diff
changeset
|
1032 |
2889
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
1033 int rtc_fd=-1; |
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
1034 |
1369
7a2f1881b776
a_frame, v_frame killed, using sh_audio/video->timer. has_audio not more used after initialization.
arpi
parents:
1353
diff
changeset
|
1035 //float a_frame=0; // Audio |
1014
e01dc1a88edf
fixed punkso's mess... local variables moved back to main()
arpi_esp
parents:
1009
diff
changeset
|
1036 |
e01dc1a88edf
fixed punkso's mess... local variables moved back to main()
arpi_esp
parents:
1009
diff
changeset
|
1037 int i; |
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9831
diff
changeset
|
1038 char *tmp; |
1014
e01dc1a88edf
fixed punkso's mess... local variables moved back to main()
arpi_esp
parents:
1009
diff
changeset
|
1039 |
1787
de6a0987a08d
stop fixed, fileselector supp. maybe not work, couldn't test
arpi
parents:
1772
diff
changeset
|
1040 int gui_no_filename=0; |
de6a0987a08d
stop fixed, fileselector supp. maybe not work, couldn't test
arpi
parents:
1772
diff
changeset
|
1041 |
9610 | 1042 |
8932
967a1d1f70c6
The following patch adds a call to srand() with the current time at the
arpi
parents:
8925
diff
changeset
|
1043 srand((int) time(NULL)); |
967a1d1f70c6
The following patch adds a call to srand() with the current time at the
arpi
parents:
8925
diff
changeset
|
1044 |
5221 | 1045 mp_msg_init(); |
1046 mp_msg_set_level(MSGL_STATUS); | |
1567 | 1047 |
14296 | 1048 mp_msg(MSGT_CPLAYER,MSGL_INFO, "MPlayer " VERSION " (C) 2000-2005 MPlayer Team\n"); |
2272 | 1049 /* Test for cpu capabilities (and corresponding OS support) for optimizing */ |
9003 | 1050 GetCpuCaps(&gCpuCaps); |
14610
9e81b41838e6
Print CPUflags and extension support on x86_64, too
reimar
parents:
14561
diff
changeset
|
1051 #if defined(ARCH_X86) || defined(ARCH_X86_64) |
6135 | 1052 mp_msg(MSGT_CPLAYER,MSGL_INFO,"CPUflags: MMX: %d MMX2: %d 3DNow: %d 3DNow2: %d SSE: %d SSE2: %d\n", |
1053 gCpuCaps.hasMMX,gCpuCaps.hasMMX2, | |
2272 | 1054 gCpuCaps.has3DNow, gCpuCaps.has3DNowExt, |
1055 gCpuCaps.hasSSE, gCpuCaps.hasSSE2); | |
3742 | 1056 #ifdef RUNTIME_CPUDETECT |
6930 | 1057 mp_msg(MSGT_CPLAYER,MSGL_INFO, MSGTR_CompiledWithRuntimeDetection); |
3742 | 1058 #else |
6930 | 1059 mp_msg(MSGT_CPLAYER,MSGL_INFO, MSGTR_CompiledWithCPUExtensions); |
3742 | 1060 #ifdef HAVE_MMX |
1061 mp_msg(MSGT_CPLAYER,MSGL_INFO," MMX"); | |
1062 #endif | |
1063 #ifdef HAVE_MMX2 | |
1064 mp_msg(MSGT_CPLAYER,MSGL_INFO," MMX2"); | |
1065 #endif | |
1066 #ifdef HAVE_3DNOW | |
1067 mp_msg(MSGT_CPLAYER,MSGL_INFO," 3DNow"); | |
1068 #endif | |
1069 #ifdef HAVE_3DNOWEX | |
1070 mp_msg(MSGT_CPLAYER,MSGL_INFO," 3DNowEx"); | |
1071 #endif | |
1072 #ifdef HAVE_SSE | |
1073 mp_msg(MSGT_CPLAYER,MSGL_INFO," SSE"); | |
1074 #endif | |
6135 | 1075 #ifdef HAVE_SSE2 |
1076 mp_msg(MSGT_CPLAYER,MSGL_INFO," SSE2"); | |
1077 #endif | |
1078 mp_msg(MSGT_CPLAYER,MSGL_INFO,"\n\n"); | |
3742 | 1079 #endif |
2272 | 1080 #endif |
1081 | |
10646 | 1082 #if defined(WIN32) && defined(USE_WIN32DLL) |
1083 { /*make our codec dirs available for LoadLibraryA()*/ | |
1084 char tmppath[MAX_PATH*2 + 1]; | |
1085 char win32path[MAX_PATH]; | |
1086 char realpath[MAX_PATH]; | |
1087 #ifdef __CYGWIN__ | |
1088 cygwin_conv_to_full_win32_path(WIN32_PATH,win32path); | |
1089 strcpy(tmppath,win32path); | |
1090 #ifdef USE_REALCODECS | |
1091 cygwin_conv_to_full_win32_path(REALCODEC_PATH,realpath); | |
1092 sprintf(tmppath,"%s;%s",win32path,realpath); | |
1093 #endif /*USE_REALCODECS*/ | |
1094 #else | |
1095 if(!strstr(WIN32_PATH,":")){ | |
1096 GetModuleFileNameA(NULL, win32path, MAX_PATH); | |
1097 strcpy(win32path + strlen(win32path) - strlen("mplayer.exe"), WIN32_PATH); | |
1098 } | |
1099 else strcpy(win32path,WIN32_PATH); | |
1100 strcpy(tmppath,win32path); | |
1101 #ifdef USE_REALCODECS | |
1102 if(!strstr(REALCODEC_PATH,":")){ | |
1103 GetModuleFileNameA(NULL, realpath, MAX_PATH); | |
1104 strcpy(realpath + strlen(realpath) - strlen("mplayer.exe"), REALCODEC_PATH); | |
1105 } | |
1106 else strcpy(realpath,REALCODEC_PATH); | |
1107 sprintf(tmppath,"%s;%s",win32path,realpath); | |
1108 #endif /*USE_REALCODECS*/ | |
1109 #endif /*__CYGWIN__*/ | |
1110 SetEnvironmentVariableA("PATH", tmppath); | |
1111 } | |
1112 #endif /*WIN32 && USE_WIN32DLL*/ | |
1113 | |
7068
6c2d746b17bf
10l, fix compiling without tv. patch by Andreas Hess <jaska@gmx.net>
arpi
parents:
7058
diff
changeset
|
1114 #ifdef USE_TV |
5572
8cd761968f35
BSD-BT848 TV update patch by Charles Henrich <henrich@sigbus.com>
arpi
parents:
5520
diff
changeset
|
1115 tv_param_immediate = 1; |
7068
6c2d746b17bf
10l, fix compiling without tv. patch by Andreas Hess <jaska@gmx.net>
arpi
parents:
7058
diff
changeset
|
1116 #endif |
5572
8cd761968f35
BSD-BT848 TV update patch by Charles Henrich <henrich@sigbus.com>
arpi
parents:
5520
diff
changeset
|
1117 |
1709 | 1118 if ( argv[0] ) |
1119 if(!strcmp(argv[0],"gmplayer") || | |
1120 (strrchr(argv[0],'/') && !strcmp(strrchr(argv[0],'/'),"/gmplayer") ) ) | |
1121 use_gui=1; | |
1639 | 1122 |
8164
487cfc28525d
New config system + cleanup of header inter dependency
albeu
parents:
8123
diff
changeset
|
1123 mconfig = m_config_new(); |
4156
22fadd4022b5
playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents:
4152
diff
changeset
|
1124 m_config_register_options(mconfig,mplayer_opts); |
22fadd4022b5
playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents:
4152
diff
changeset
|
1125 // TODO : add something to let modules register their options |
7867 | 1126 mp_input_register_options(mconfig); |
4156
22fadd4022b5
playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents:
4152
diff
changeset
|
1127 parse_cfgfiles(mconfig); |
22fadd4022b5
playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents:
4152
diff
changeset
|
1128 |
7019 | 1129 #ifdef HAVE_NEW_GUI |
1130 if ( use_gui ) cfg_read(); | |
1131 #endif | |
4156
22fadd4022b5
playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents:
4152
diff
changeset
|
1132 |
8164
487cfc28525d
New config system + cleanup of header inter dependency
albeu
parents:
8123
diff
changeset
|
1133 playtree = m_config_parse_mp_command_line(mconfig, argc, argv); |
487cfc28525d
New config system + cleanup of header inter dependency
albeu
parents:
8123
diff
changeset
|
1134 if(playtree == NULL) |
13500 | 1135 exit_player(NULL); |
4156
22fadd4022b5
playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents:
4152
diff
changeset
|
1136 |
4045
898caa690c0b
playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents:
3934
diff
changeset
|
1137 playtree = play_tree_cleanup(playtree); |
898caa690c0b
playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents:
3934
diff
changeset
|
1138 if(playtree) { |
4156
22fadd4022b5
playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents:
4152
diff
changeset
|
1139 playtree_iter = play_tree_iter_new(playtree,mconfig); |
4045
898caa690c0b
playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents:
3934
diff
changeset
|
1140 if(playtree_iter) { |
898caa690c0b
playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents:
3934
diff
changeset
|
1141 if(play_tree_iter_step(playtree_iter,0,0) != PLAY_TREE_ITER_ENTRY) { |
898caa690c0b
playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents:
3934
diff
changeset
|
1142 play_tree_iter_free(playtree_iter); |
898caa690c0b
playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents:
3934
diff
changeset
|
1143 playtree_iter = NULL; |
898caa690c0b
playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents:
3934
diff
changeset
|
1144 } |
898caa690c0b
playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents:
3934
diff
changeset
|
1145 filename = play_tree_iter_get_file(playtree_iter,1); |
898caa690c0b
playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents:
3934
diff
changeset
|
1146 } |
898caa690c0b
playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents:
3934
diff
changeset
|
1147 } |
898caa690c0b
playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents:
3934
diff
changeset
|
1148 |
1709 | 1149 #ifndef HAVE_NEW_GUI |
1150 if(use_gui){ | |
1973
5216f108cb4f
all error/warn/info messages moved to help_mp-en.h for translation
arpi
parents:
1962
diff
changeset
|
1151 mp_msg(MSGT_CPLAYER,MSGL_WARN,MSGTR_NoGui); |
1709 | 1152 use_gui=0; |
1153 } | |
1723
5e4214a7540e
GUI stuff. now seeking works, and xmga renders to video window
arpi
parents:
1709
diff
changeset
|
1154 #else |
5e4214a7540e
GUI stuff. now seeking works, and xmga renders to video window
arpi
parents:
1709
diff
changeset
|
1155 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
|
1156 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
|
1157 use_gui=0; |
5e4214a7540e
GUI stuff. now seeking works, and xmga renders to video window
arpi
parents:
1709
diff
changeset
|
1158 } |
9291
64b8c5a07c2c
- It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents:
9217
diff
changeset
|
1159 if (use_gui && playtree_iter){ |
9319 | 1160 char cwd[PATH_MAX+2]; |
9291
64b8c5a07c2c
- It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents:
9217
diff
changeset
|
1161 // Remove Playtree and Playtree-Iter from memory as its not used by gui |
64b8c5a07c2c
- It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents:
9217
diff
changeset
|
1162 play_tree_iter_free(playtree_iter); |
64b8c5a07c2c
- It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents:
9217
diff
changeset
|
1163 playtree_iter=NULL; |
9301
7841308ad250
this patch fixes latest bug, discovered by .so ... (relative filenames &
arpi
parents:
9291
diff
changeset
|
1164 |
9318
51a9af80d874
PATH_MAX should be more portable, and we even include limits.h to be sure
arpi
parents:
9317
diff
changeset
|
1165 if (getcwd(cwd, PATH_MAX) != (char *)NULL) |
9301
7841308ad250
this patch fixes latest bug, discovered by .so ... (relative filenames &
arpi
parents:
9291
diff
changeset
|
1166 { |
7841308ad250
this patch fixes latest bug, discovered by .so ... (relative filenames &
arpi
parents:
9291
diff
changeset
|
1167 strcat(cwd, "/"); |
7841308ad250
this patch fixes latest bug, discovered by .so ... (relative filenames &
arpi
parents:
9291
diff
changeset
|
1168 // Prefix relative paths with current working directory |
7841308ad250
this patch fixes latest bug, discovered by .so ... (relative filenames &
arpi
parents:
9291
diff
changeset
|
1169 play_tree_add_bpf(playtree, cwd); |
7841308ad250
this patch fixes latest bug, discovered by .so ... (relative filenames &
arpi
parents:
9291
diff
changeset
|
1170 } |
9291
64b8c5a07c2c
- It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents:
9217
diff
changeset
|
1171 // Import initital playtree into gui |
64b8c5a07c2c
- It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents:
9217
diff
changeset
|
1172 import_initial_playtree_into_gui(playtree, mconfig, enqueue); |
64b8c5a07c2c
- It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents:
9217
diff
changeset
|
1173 } |
1709 | 1174 #endif |
1175 | |
7562
92188b57a062
video out driver list support (like -vc, example: -vo xmga,xv,x11,)
arpi
parents:
7559
diff
changeset
|
1176 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
|
1177 list_video_out(); |
13500 | 1178 exit_player_with_rc(NULL, 0); |
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
|
1179 } |
5072 | 1180 |
7563
e9e4398029de
audio out driver list support (example: -ao alsa9,sdl:esd,oss,sdl:oss,)
arpi
parents:
7562
diff
changeset
|
1181 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
|
1182 list_audio_out(); |
13500 | 1183 exit_player_with_rc(NULL, 0); |
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
|
1184 } |
1639 | 1185 |
1983 | 1186 // check codec.conf |
11759
29eea271490e
add -codecs-file for selecting a specific codecs.conf on the comand line
attila
parents:
11592
diff
changeset
|
1187 if(!codecs_file || !parse_codec_cfg(codecs_file)){ |
12890 | 1188 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
|
1189 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
|
1190 if(!parse_codec_cfg(NULL)){ |
29eea271490e
add -codecs-file for selecting a specific codecs.conf on the comand line
attila
parents:
11592
diff
changeset
|
1191 mp_msg(MSGT_CPLAYER,MSGL_HINT,MSGTR_CopyCodecsConf); |
13500 | 1192 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
|
1193 } |
13946 | 1194 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
|
1195 } |
1983 | 1196 } |
12890 | 1197 free( mem_ptr ); // release the buffer created by get_path() |
1983 | 1198 } |
1199 | |
7506
c1cb94198e05
-vc/-vfm accepts codec/driver _list_ now. empty list element for -vc means
arpi
parents:
7502
diff
changeset
|
1200 #if 0 |
c1cb94198e05
-vc/-vfm accepts codec/driver _list_ now. empty list element for -vc means
arpi
parents:
7502
diff
changeset
|
1201 if(video_codec_list){ |
c1cb94198e05
-vc/-vfm accepts codec/driver _list_ now. empty list element for -vc means
arpi
parents:
7502
diff
changeset
|
1202 int i; |
c1cb94198e05
-vc/-vfm accepts codec/driver _list_ now. empty list element for -vc means
arpi
parents:
7502
diff
changeset
|
1203 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
|
1204 for(i=0;video_codec_list[i];i++) |
13577 | 1205 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
|
1206 } |
c1cb94198e05
-vc/-vfm accepts codec/driver _list_ now. empty list element for -vc means
arpi
parents:
7502
diff
changeset
|
1207 #endif |
7522 | 1208 if(audio_codec_list && strcmp(audio_codec_list[0],"help")==0){ |
6930 | 1209 mp_msg(MSGT_CPLAYER, MSGL_INFO, MSGTR_AvailableAudioCodecs); |
1983 | 1210 list_codecs(1); |
13577 | 1211 mp_msg(MSGT_FIXME, MSGL_FIXME, "\n"); |
13500 | 1212 exit_player_with_rc(NULL, 0); |
1983 | 1213 } |
7506
c1cb94198e05
-vc/-vfm accepts codec/driver _list_ now. empty list element for -vc means
arpi
parents:
7502
diff
changeset
|
1214 if(video_codec_list && strcmp(video_codec_list[0],"help")==0){ |
6930 | 1215 mp_msg(MSGT_CPLAYER, MSGL_INFO, MSGTR_AvailableVideoCodecs); |
1983 | 1216 list_codecs(0); |
13577 | 1217 mp_msg(MSGT_FIXME, MSGL_FIXME, "\n"); |
13500 | 1218 exit_player_with_rc(NULL, 0); |
1983 | 1219 } |
7506
c1cb94198e05
-vc/-vfm accepts codec/driver _list_ now. empty list element for -vc means
arpi
parents:
7502
diff
changeset
|
1220 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
|
1221 vfm_help(); |
13577 | 1222 mp_msg(MSGT_FIXME, MSGL_FIXME, "\n"); |
13500 | 1223 exit_player_with_rc(NULL, 0); |
7191
1eadce15446c
-afm/-vfm help implemenetd, some cosmetics of ad/vd codec names/comments
arpi
parents:
7180
diff
changeset
|
1224 } |
7522 | 1225 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
|
1226 afm_help(); |
13577 | 1227 mp_msg(MSGT_FIXME, MSGL_FIXME, "\n"); |
13500 | 1228 exit_player_with_rc(NULL, 0); |
7191
1eadce15446c
-afm/-vfm help implemenetd, some cosmetics of ad/vd codec names/comments
arpi
parents:
7180
diff
changeset
|
1229 } |
13269
aa13937da8a0
mplayer -af help now lists all available audio filters.
ivo
parents:
13228
diff
changeset
|
1230 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
|
1231 af_help(); |
aa13937da8a0
mplayer -af help now lists all available audio filters.
ivo
parents:
13228
diff
changeset
|
1232 printf("\n"); |
13500 | 1233 exit_player_with_rc(NULL, 0); |
13269
aa13937da8a0
mplayer -af help now lists all available audio filters.
ivo
parents:
13228
diff
changeset
|
1234 } |
9336 | 1235 #ifdef HAVE_X11 |
9317
c7f5df43b937
- support command line parameter -fstype, eg. -fstype layer=12,above,fullscreen
filon
parents:
9315
diff
changeset
|
1236 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
|
1237 fstype_help(); |
13577 | 1238 mp_msg(MSGT_FIXME, MSGL_FIXME, "\n"); |
13500 | 1239 exit_player_with_rc(NULL, 0); |
9317
c7f5df43b937
- support command line parameter -fstype, eg. -fstype layer=12,above,fullscreen
filon
parents:
9315
diff
changeset
|
1240 } |
9336 | 1241 #endif |
1983 | 1242 |
8531
1aa2c9b460af
Merged EDL 0.5 patch - it's something like Quicktime's edit lists.
arpi
parents:
8494
diff
changeset
|
1243 #ifdef USE_EDL |
13168 | 1244 if (edl_check_mode() == EDL_ERROR && edl_filename) |
1245 { | |
13358
567875b88aab
Hardcoded EDL messages moved to help_mp-en.h, Doxygen comments added, patch
diego
parents:
13353
diff
changeset
|
1246 mp_msg(MSGT_CPLAYER, MSGL_ERR, MSGTR_EdlCantUseBothModes); |
567875b88aab
Hardcoded EDL messages moved to help_mp-en.h, Doxygen comments added, patch
diego
parents:
13353
diff
changeset
|
1247 exit_player(NULL); |
13168 | 1248 } else if (edl_filename) |
1249 { | |
14807
664b06b907cb
Some to-be-redundant EDL code moved to edl.c with mencoder's edl in mind. Stack handling improvements, Patch by Oded Shimon
reynaldo
parents:
14718
diff
changeset
|
1250 if (edl_records) free_edl(edl_records); |
664b06b907cb
Some to-be-redundant EDL code moved to edl.c with mencoder's edl in mind. Stack handling improvements, Patch by Oded Shimon
reynaldo
parents:
14718
diff
changeset
|
1251 next_edl_record = edl_records = edl_parse_file(); |
13168 | 1252 } else if (edl_output_filename) |
1253 { | |
1254 if ((edl_fd = fopen(edl_output_filename, "w")) == NULL) | |
1255 { | |
13358
567875b88aab
Hardcoded EDL messages moved to help_mp-en.h, Doxygen comments added, patch
diego
parents:
13353
diff
changeset
|
1256 mp_msg(MSGT_CPLAYER, MSGL_ERR, MSGTR_EdlCantOpenForWrite, |
13168 | 1257 edl_output_filename); |
13358
567875b88aab
Hardcoded EDL messages moved to help_mp-en.h, Doxygen comments added, patch
diego
parents:
13353
diff
changeset
|
1258 exit_player(NULL); |
13168 | 1259 } |
1260 } | |
8531
1aa2c9b460af
Merged EDL 0.5 patch - it's something like Quicktime's edit lists.
arpi
parents:
8494
diff
changeset
|
1261 #endif |
1983 | 1262 |
9752 | 1263 if(!filename){ |
1787
de6a0987a08d
stop fixed, fileselector supp. maybe not work, couldn't test
arpi
parents:
1772
diff
changeset
|
1264 if(!use_gui){ |
1690 | 1265 // no file/vcd/dvd -> show HELP: |
5112 | 1266 mp_msg(MSGT_CPLAYER, MSGL_INFO, help_text); |
13500 | 1267 exit_player_with_rc(NULL, 0); |
1787
de6a0987a08d
stop fixed, fileselector supp. maybe not work, couldn't test
arpi
parents:
1772
diff
changeset
|
1268 } else gui_no_filename=1; |
1690 | 1269 } |
1270 | |
1271 // Many users forget to include command line in bugreports... | |
8027 | 1272 if(verbose>0){ |
13577 | 1273 mp_msg(MSGT_CPLAYER, MSGL_INFO, MSGTR_CommandLine); |
14530 | 1274 for(i=1;i<argc;i++)mp_msg(MSGT_CPLAYER, MSGL_INFO," '%s'",argv[i]); |
1275 mp_msg(MSGT_CPLAYER, MSGL_INFO, "\n"); | |
1690 | 1276 } |
1277 | |
5221 | 1278 mp_msg_set_level(verbose+MSGL_STATUS); |
1183 | 1279 |
1639 | 1280 //------ load global data first ------ |
955 | 1281 |
11580
90953d955165
Fontconfig support based on patch by Arwed von Merkatz <v.merkatz@gmx.net>, but slightly reworked
alex
parents:
11542
diff
changeset
|
1282 // check font |
7122
0dc9cb756b68
freetype 2.0/2.1+ support - disabled by default until bugs fixed
arpi
parents:
7111
diff
changeset
|
1283 #ifdef USE_OSD |
11580
90953d955165
Fontconfig support based on patch by Arwed von Merkatz <v.merkatz@gmx.net>, but slightly reworked
alex
parents:
11542
diff
changeset
|
1284 #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
|
1285 init_freetype(); |
90953d955165
Fontconfig support based on patch by Arwed von Merkatz <v.merkatz@gmx.net>, but slightly reworked
alex
parents:
11542
diff
changeset
|
1286 #endif |
90953d955165
Fontconfig support based on patch by Arwed von Merkatz <v.merkatz@gmx.net>, but slightly reworked
alex
parents:
11542
diff
changeset
|
1287 #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
|
1288 if(!font_fontconfig) |
90953d955165
Fontconfig support based on patch by Arwed von Merkatz <v.merkatz@gmx.net>, but slightly reworked
alex
parents:
11542
diff
changeset
|
1289 { |
90953d955165
Fontconfig support based on patch by Arwed von Merkatz <v.merkatz@gmx.net>, but slightly reworked
alex
parents:
11542
diff
changeset
|
1290 #endif |
212 | 1291 if(font_name){ |
337 | 1292 vo_font=read_font_desc(font_name,font_factor,verbose>1); |
1582 | 1293 if(!vo_font) mp_msg(MSGT_CPLAYER,MSGL_ERR,MSGTR_CantLoadFont,font_name); |
220 | 1294 } else { |
1295 // try default: | |
12890 | 1296 vo_font=read_font_desc( mem_ptr=get_path("font/font.desc"),font_factor,verbose>1); |
1297 free(mem_ptr); // release the buffer created by get_path() | |
1353 | 1298 if(!vo_font) |
10272
7b0bc557987b
renames: DATADIR->MPLAYER_DATADIR, CONFDIR->MPLAYER_CONFDIR, LIBDIR->MPLAYER_LIBDIR
arpi
parents:
10240
diff
changeset
|
1299 vo_font=read_font_desc(MPLAYER_DATADIR "/font/font.desc",font_factor,verbose>1); |
212 | 1300 } |
11580
90953d955165
Fontconfig support based on patch by Arwed von Merkatz <v.merkatz@gmx.net>, but slightly reworked
alex
parents:
11542
diff
changeset
|
1301 #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
|
1302 } |
1422 | 1303 #endif |
7122
0dc9cb756b68
freetype 2.0/2.1+ support - disabled by default until bugs fixed
arpi
parents:
7111
diff
changeset
|
1304 #endif |
5638
86663f1b9b00
new osd code, use osd objs to follow changes and do minimal updates
arpi
parents:
5627
diff
changeset
|
1305 vo_init_osd(); |
86663f1b9b00
new osd code, use osd objs to follow changes and do minimal updates
arpi
parents:
5627
diff
changeset
|
1306 |
3015 | 1307 #ifdef HAVE_RTC |
5055 | 1308 if(!nortc) |
1309 { | |
7494 | 1310 // seteuid(0); /* Can't hurt to try to get root here */ |
12681 | 1311 if ((rtc_fd = open(rtc_device ? rtc_device : "/dev/rtc", O_RDONLY)) < 0) |
13577 | 1312 mp_msg(MSGT_CPLAYER, MSGL_WARN, MSGTR_RTCDeviceNotOpenable, |
12681 | 1313 rtc_device ? rtc_device : "/dev/rtc", strerror(errno)); |
7494 | 1314 else { |
1315 unsigned long irqp = 1024; /* 512 seemed OK. 128 is jerky. */ | |
1316 | |
1317 if (ioctl(rtc_fd, RTC_IRQP_SET, irqp) < 0) { | |
13577 | 1318 mp_msg(MSGT_CPLAYER, MSGL_WARN, MSGTR_LinuxRTCInitErrorIrqpSet, irqp, strerror(errno)); |
1319 mp_msg(MSGT_CPLAYER, MSGL_HINT, MSGTR_IncreaseRTCMaxUserFreq, irqp); | |
7494 | 1320 close (rtc_fd); |
2889
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
1321 rtc_fd = -1; |
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
1322 } 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
|
1323 /* variable only by the root */ |
13577 | 1324 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
|
1325 close (rtc_fd); |
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
1326 rtc_fd = -1; |
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
1327 } else |
13946 | 1328 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
|
1329 } |
5055 | 1330 } |
4176
116abdd0aed1
small gtk bug fix (-display bug, baze gabu, miattad fogok elkarhozni:), and remove gui dependencie in mencoder
pontscho
parents:
4160
diff
changeset
|
1331 #ifdef HAVE_NEW_GUI |
3825 | 1332 // 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
|
1333 // 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
|
1334 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
|
1335 #endif |
2889
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
1336 if(rtc_fd<0) |
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
1337 #endif |
13946 | 1338 mp_msg(MSGT_CPLAYER, MSGL_V, "Using %s timing\n", |
12954 | 1339 softsleep?"software":timer_name); |
2889
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
1340 |
1639 | 1341 #ifdef USE_TERMCAP |
3618 | 1342 if ( !use_gui ) load_termcap(NULL); // load key-codes |
1639 | 1343 #endif |
1344 | |
1816 | 1345 // ========== Init keyboard FIFO (connection to libvo) ============ |
1694 | 1346 |
4418
8141d2c399e4
A new configurable input system and joystick support for this system
albeu
parents:
4395
diff
changeset
|
1347 // Init input system |
8141d2c399e4
A new configurable input system and joystick support for this system
albeu
parents:
4395
diff
changeset
|
1348 current_module = "init_input"; |
8141d2c399e4
A new configurable input system and joystick support for this system
albeu
parents:
4395
diff
changeset
|
1349 mp_input_init(); |
14077
3d3f3cc8494a
use a configurable-size ringbuffer instead of a pipe for buffering key events.
reimar
parents:
14053
diff
changeset
|
1350 #if 0 |
9831 | 1351 make_pipe(&keyb_fifo_get,&keyb_fifo_put); |
1352 | |
4418
8141d2c399e4
A new configurable input system and joystick support for this system
albeu
parents:
4395
diff
changeset
|
1353 if(keyb_fifo_get > 0) |
8141d2c399e4
A new configurable input system and joystick support for this system
albeu
parents:
4395
diff
changeset
|
1354 mp_input_add_key_fd(keyb_fifo_get,1,NULL,NULL); |
9831 | 1355 #else |
1356 mp_input_add_key_fd(-1,0,mplayer_get_key,NULL); | |
1357 #endif | |
4418
8141d2c399e4
A new configurable input system and joystick support for this system
albeu
parents:
4395
diff
changeset
|
1358 if(slave_mode) |
10928 | 1359 #ifndef __MINGW32__ |
4418
8141d2c399e4
A new configurable input system and joystick support for this system
albeu
parents:
4395
diff
changeset
|
1360 mp_input_add_cmd_fd(0,1,NULL,NULL); |
10928 | 1361 #else |
1362 mp_input_add_cmd_fd(0,0,mp_input_win32_slave_cmd_func,NULL); | |
1363 #endif | |
12816 | 1364 else if(!noconsolecontrols) |
9831 | 1365 #ifndef HAVE_NO_POSIX_SELECT |
4418
8141d2c399e4
A new configurable input system and joystick support for this system
albeu
parents:
4395
diff
changeset
|
1366 mp_input_add_key_fd(0,1,NULL,NULL); |
9831 | 1367 #else |
1368 mp_input_add_key_fd(0,0,NULL,NULL); | |
1369 #endif | |
1370 | |
4431 | 1371 inited_flags|=INITED_INPUT; |
4418
8141d2c399e4
A new configurable input system and joystick support for this system
albeu
parents:
4395
diff
changeset
|
1372 current_module = NULL; |
8141d2c399e4
A new configurable input system and joystick support for this system
albeu
parents:
4395
diff
changeset
|
1373 |
8198 | 1374 #ifdef HAVE_MENU |
1375 if(use_menu) { | |
8723
48a2c2545d5c
Use system-wide menu.conf file if nothing else is availible,
filon
parents:
8672
diff
changeset
|
1376 if(menu_cfg && menu_init(menu_cfg)) |
13577 | 1377 mp_msg(MSGT_CPLAYER,MSGL_INFO,MSGTR_MenuInitialized, menu_cfg); |
8198 | 1378 else { |
8723
48a2c2545d5c
Use system-wide menu.conf file if nothing else is availible,
filon
parents:
8672
diff
changeset
|
1379 menu_cfg = get_path("menu.conf"); |
48a2c2545d5c
Use system-wide menu.conf file if nothing else is availible,
filon
parents:
8672
diff
changeset
|
1380 if(menu_init(menu_cfg)) |
13577 | 1381 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
|
1382 else { |
10272
7b0bc557987b
renames: DATADIR->MPLAYER_DATADIR, CONFDIR->MPLAYER_CONFDIR, LIBDIR->MPLAYER_LIBDIR
arpi
parents:
10240
diff
changeset
|
1383 if(menu_init(MPLAYER_CONFDIR "/menu.conf")) |
13577 | 1384 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
|
1385 else { |
13577 | 1386 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
|
1387 use_menu = 0; |
48a2c2545d5c
Use system-wide menu.conf file if nothing else is availible,
filon
parents:
8672
diff
changeset
|
1388 } |
48a2c2545d5c
Use system-wide menu.conf file if nothing else is availible,
filon
parents:
8672
diff
changeset
|
1389 } |
8198 | 1390 } |
1391 } | |
1392 #endif | |
1393 | |
13391 | 1394 /// Catch signals |
1395 #ifndef __MINGW32__ | |
1396 signal(SIGCHLD,child_sighandler); | |
1397 #endif | |
4418
8141d2c399e4
A new configurable input system and joystick support for this system
albeu
parents:
4395
diff
changeset
|
1398 |
13794 | 1399 #ifdef CRASH_DEBUG |
1400 prog_path = argv[0]; | |
1401 #endif | |
1639 | 1402 //========= Catch terminate signals: ================ |
1403 // terminate requests: | |
1404 signal(SIGTERM,exit_sighandler); // kill | |
1405 signal(SIGHUP,exit_sighandler); // kill -HUP / xterm closed | |
1406 | |
1729 | 1407 signal(SIGINT,exit_sighandler); // Interrupt from keyboard |
1639 | 1408 |
1409 signal(SIGQUIT,exit_sighandler); // Quit from keyboard | |
5367
658ea5d7316a
Allow to disable crasj sighandler to enable creation of coredump files.
atmos4
parents:
5326
diff
changeset
|
1410 #ifdef ENABLE_SIGHANDLER |
1639 | 1411 // fatal errors: |
1412 signal(SIGBUS,exit_sighandler); // bus error | |
1413 signal(SIGSEGV,exit_sighandler); // segfault | |
1414 signal(SIGILL,exit_sighandler); // illegal instruction | |
1415 signal(SIGFPE,exit_sighandler); // floating point exc. | |
1416 signal(SIGABRT,exit_sighandler); // abort() | |
13794 | 1417 #ifdef CRASH_DEBUG |
1418 if (crash_debug) | |
1419 signal(SIGTRAP,exit_sighandler); | |
1420 #endif | |
5367
658ea5d7316a
Allow to disable crasj sighandler to enable creation of coredump files.
atmos4
parents:
5326
diff
changeset
|
1421 #endif |
1639 | 1422 |
4963 | 1423 #ifdef HAVE_NEW_GUI |
1424 if(use_gui){ | |
6218 | 1425 guiInit(); |
4963 | 1426 inited_flags|=INITED_GUI; |
4974 | 1427 guiGetEvent( guiCEvent,(char *)((gui_no_filename) ? 0 : 1) ); |
4963 | 1428 } |
1429 #endif | |
1430 | |
5983 | 1431 // ******************* Now, let's see the per-file stuff ******************** |
1432 | |
1639 | 1433 play_next_file: |
1787
de6a0987a08d
stop fixed, fileselector supp. maybe not work, couldn't test
arpi
parents:
1772
diff
changeset
|
1434 |
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
|
1435 // init global sub numbers |
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
|
1436 global_sub_size = 0; |
a5004eb92a79
fix sub_select fiasco with global sub numbering. now multiple sub sources can be managed in essentially one list.
joey
parents:
13500
diff
changeset
|
1437 { int i; for (i = 0; i < SUB_SOURCES; i++) global_sub_indices[i] = -1; } |
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
|
1438 global_sub_quiet_osd_hack = 1; |
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
|
1439 |
8614
49e36bf2f342
The patch adds support for a per-file config, which is loaded before
arpi
parents:
8612
diff
changeset
|
1440 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
|
1441 |
4835
1f59d4d73558
Fix my mistake (forgot to remove a getch2_enable) but in the rigth
albeu
parents:
4834
diff
changeset
|
1442 // 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
|
1443 // or cache filling |
12816 | 1444 if(!noconsolecontrols && !slave_mode){ |
5983 | 1445 if(inited_flags&INITED_GETCH2) |
13577 | 1446 mp_msg(MSGT_CPLAYER,MSGL_WARN,MSGTR_Getch2InitializedTwice); |
5983 | 1447 else |
1448 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
|
1449 inited_flags|=INITED_GETCH2; |
5154 | 1450 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
|
1451 } |
4825
41d2da3bd082
Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents:
4818
diff
changeset
|
1452 |
5983 | 1453 // =================== GUI idle loop (STOP state) =========================== |
1745 | 1454 #ifdef HAVE_NEW_GUI |
1787
de6a0987a08d
stop fixed, fileselector supp. maybe not work, couldn't test
arpi
parents:
1772
diff
changeset
|
1455 if ( use_gui ) { |
8423 | 1456 file_format=DEMUXER_TYPE_UNKNOWN; |
1457 guiGetEvent( guiSetDefaults,0 ); | |
5665 | 1458 while ( guiIntfStruct.Playing != 1 ) |
1459 { | |
4858 | 1460 mp_cmd_t* cmd; |
9464 | 1461 usec_sleep(20000); |
4798 | 1462 guiEventHandling(); |
6619
f554e7271587
fix volume handling ( step 2 ) -- add balance support and some code cleanup and fix
pontscho
parents:
6590
diff
changeset
|
1463 guiGetEvent( guiReDraw,NULL ); |
13603 | 1464 if ( (cmd = mp_input_get_cmd(0,0,0)) != NULL) guiGetEvent( guiIEvent,(char *)cmd->id ); |
5665 | 1465 } |
8423 | 1466 guiGetEvent( guiSetParameters,NULL ); |
1467 if ( guiIntfStruct.StreamType == STREAMTYPE_STREAM ) | |
3543 | 1468 { |
4950 | 1469 play_tree_t * entry = play_tree_new(); |
1470 play_tree_add_file( entry,guiIntfStruct.Filename ); | |
4974 | 1471 if ( playtree ) play_tree_free_list( playtree->child,1 ); |
1472 else playtree=play_tree_new(); | |
1473 play_tree_set_child( playtree,entry ); | |
1474 if(playtree) | |
4950 | 1475 { |
4974 | 1476 playtree_iter = play_tree_iter_new(playtree,mconfig); |
4950 | 1477 if(playtree_iter) |
1478 { | |
1479 if(play_tree_iter_step(playtree_iter,0,0) != PLAY_TREE_ITER_ENTRY) | |
1480 { | |
1481 play_tree_iter_free(playtree_iter); | |
1482 playtree_iter = NULL; | |
1483 } | |
1484 filename = play_tree_iter_get_file(playtree_iter,1); | |
1485 } | |
1486 } | |
4974 | 1487 } |
1787
de6a0987a08d
stop fixed, fileselector supp. maybe not work, couldn't test
arpi
parents:
1772
diff
changeset
|
1488 } |
de6a0987a08d
stop fixed, fileselector supp. maybe not work, couldn't test
arpi
parents:
1772
diff
changeset
|
1489 #endif |
5983 | 1490 //--------------------------------------------------------------------------- |
1787
de6a0987a08d
stop fixed, fileselector supp. maybe not work, couldn't test
arpi
parents:
1772
diff
changeset
|
1491 |
1973
5216f108cb4f
all error/warn/info messages moved to help_mp-en.h for translation
arpi
parents:
1962
diff
changeset
|
1492 if(filename) mp_msg(MSGT_CPLAYER,MSGL_INFO,MSGTR_Playing, filename); |
1650
7502b16bce63
make automatic subfile detection working with many files
atlka
parents:
1641
diff
changeset
|
1493 |
5983 | 1494 //==================== Open VOB-Sub ============================ |
1495 | |
4770
59f8fd64538b
autodetect vobsub filename, disable autosub if vobsub found.
atmos4
parents:
4754
diff
changeset
|
1496 current_module="vobsub"; |
59f8fd64538b
autodetect vobsub filename, disable autosub if vobsub found.
atmos4
parents:
4754
diff
changeset
|
1497 if (vobsub_name){ |
6110 | 1498 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
|
1499 if(vo_vobsub==NULL) |
59f8fd64538b
autodetect vobsub filename, disable autosub if vobsub found.
atmos4
parents:
4754
diff
changeset
|
1500 mp_msg(MSGT_CPLAYER,MSGL_ERR,MSGTR_CantLoadSub,vobsub_name); |
59f8fd64538b
autodetect vobsub filename, disable autosub if vobsub found.
atmos4
parents:
4754
diff
changeset
|
1501 }else if(sub_auto && filename && (strlen(filename)>=5)){ |
59f8fd64538b
autodetect vobsub filename, disable autosub if vobsub found.
atmos4
parents:
4754
diff
changeset
|
1502 /* try to autodetect vobsub from movie filename ::atmos */ |
59f8fd64538b
autodetect vobsub filename, disable autosub if vobsub found.
atmos4
parents:
4754
diff
changeset
|
1503 char *buf = malloc((strlen(filename)-3) * sizeof(char)); |
59f8fd64538b
autodetect vobsub filename, disable autosub if vobsub found.
atmos4
parents:
4754
diff
changeset
|
1504 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
|
1505 strncpy(buf, filename, strlen(filename)-4); |
6110 | 1506 vo_vobsub=vobsub_open(buf,spudec_ifo,0,&vo_spudec); |
4770
59f8fd64538b
autodetect vobsub filename, disable autosub if vobsub found.
atmos4
parents:
4754
diff
changeset
|
1507 free(buf); |
59f8fd64538b
autodetect vobsub filename, disable autosub if vobsub found.
atmos4
parents:
4754
diff
changeset
|
1508 } |
7621
7caeb275ad26
uninit cleanup again... thx to Nilmoni Deb for bugreport
arpi
parents:
7614
diff
changeset
|
1509 if(vo_vobsub){ |
7caeb275ad26
uninit cleanup again... thx to Nilmoni Deb for bugreport
arpi
parents:
7614
diff
changeset
|
1510 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
|
1511 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
|
1512 // 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
|
1513 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
|
1514 |
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
|
1515 // setup global sub numbering |
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
|
1516 global_sub_indices[SUB_SOURCE_VOBSUB] = global_sub_size; // the global # of the first vobsub. |
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
|
1517 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
|
1518 } |
4770
59f8fd64538b
autodetect vobsub filename, disable autosub if vobsub found.
atmos4
parents:
4754
diff
changeset
|
1519 |
5151 | 1520 //============ Open & Sync STREAM --- fork cache2 ==================== |
1521 | |
5983 | 1522 stream=NULL; |
1523 demuxer=NULL; | |
10959
905acfd20c59
fix a memory leak when playing several files in a row (playlist for instance)
pl
parents:
10953
diff
changeset
|
1524 if (d_audio) { |
10997
2f7c74ce8c9a
1000l to pl, this made mplayer crash when playing playlists longer
rfelker
parents:
10959
diff
changeset
|
1525 //free_demuxer_stream(d_audio); |
10959
905acfd20c59
fix a memory leak when playing several files in a row (playlist for instance)
pl
parents:
10953
diff
changeset
|
1526 d_audio=NULL; |
905acfd20c59
fix a memory leak when playing several files in a row (playlist for instance)
pl
parents:
10953
diff
changeset
|
1527 } |
905acfd20c59
fix a memory leak when playing several files in a row (playlist for instance)
pl
parents:
10953
diff
changeset
|
1528 if (d_video) { |
10997
2f7c74ce8c9a
1000l to pl, this made mplayer crash when playing playlists longer
rfelker
parents:
10959
diff
changeset
|
1529 //free_demuxer_stream(d_video); |
10959
905acfd20c59
fix a memory leak when playing several files in a row (playlist for instance)
pl
parents:
10953
diff
changeset
|
1530 d_video=NULL; |
905acfd20c59
fix a memory leak when playing several files in a row (playlist for instance)
pl
parents:
10953
diff
changeset
|
1531 } |
5983 | 1532 sh_audio=NULL; |
1533 sh_video=NULL; | |
1534 | |
1639 | 1535 current_module="open_stream"; |
9752 | 1536 stream=open_stream(filename,0,&file_format); |
4045
898caa690c0b
playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents:
3934
diff
changeset
|
1537 if(!stream) { // error... |
4825
41d2da3bd082
Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents:
4818
diff
changeset
|
1538 eof = libmpdemux_was_interrupted(PT_NEXT_ENTRY); |
41d2da3bd082
Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents:
4818
diff
changeset
|
1539 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
|
1540 } |
2321 | 1541 inited_flags|=INITED_STREAM; |
5151 | 1542 |
8423 | 1543 #ifdef HAVE_NEW_GUI |
1544 if ( use_gui ) guiGetEvent( guiSetStream,(char *)stream ); | |
1545 #endif | |
1546 | |
9752 | 1547 if(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
|
1548 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
|
1549 // Handle playlist |
5151 | 1550 current_module="handle_playlist"; |
4045
898caa690c0b
playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents:
3934
diff
changeset
|
1551 mp_msg(MSGT_CPLAYER,MSGL_V,"Parsing playlist %s...\n",filename); |
8925
5c15777f1c07
this patch adds an fallback to playlist (any but the plaintext-list format)
arpi
parents:
8913
diff
changeset
|
1552 entry = parse_playtree(stream,0); |
5c15777f1c07
this patch adds an fallback to playlist (any but the plaintext-list format)
arpi
parents:
8913
diff
changeset
|
1553 eof=playtree_add_playlist(entry); |
4825
41d2da3bd082
Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents:
4818
diff
changeset
|
1554 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
|
1555 } |
1497
ad4d402b3d29
seek.c moved to demuxer.c, stream_reset in new_demuxer()
arpi
parents:
1496
diff
changeset
|
1556 stream->start_pos+=seek_to_byte; |
598 | 1557 |
3257 | 1558 if(stream_dump_type==5){ |
1559 unsigned char buf[4096]; | |
1560 int len; | |
1561 FILE *f; | |
5151 | 1562 current_module="dumpstream"; |
7204 | 1563 if(stream->type==STREAMTYPE_STREAM && stream->fd<0){ |
13577 | 1564 mp_msg(MSGT_CPLAYER,MSGL_FATAL,MSGTR_DumpstreamFdUnavailable); |
7204 | 1565 exit_player(MSGTR_Exit_error); |
1566 } | |
3257 | 1567 stream_reset(stream); |
1568 stream_seek(stream,stream->start_pos); | |
1569 f=fopen(stream_dump_name,"wb"); | |
1570 if(!f){ | |
1571 mp_msg(MSGT_CPLAYER,MSGL_FATAL,MSGTR_CantOpenDumpfile); | |
1572 exit_player(MSGTR_Exit_error); | |
1573 } | |
1574 while(!stream->eof){ | |
1575 len=stream_read(stream,buf,4096); | |
10225
785c945f6796
check for -dumpstream file writes, patch by Eric Lammerts <eric@lammerts.org>
alex
parents:
10223
diff
changeset
|
1576 if(len>0) { |
785c945f6796
check for -dumpstream file writes, patch by Eric Lammerts <eric@lammerts.org>
alex
parents:
10223
diff
changeset
|
1577 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
|
1578 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
|
1579 exit_player(MSGTR_Exit_error); |
785c945f6796
check for -dumpstream file writes, patch by Eric Lammerts <eric@lammerts.org>
alex
parents:
10223
diff
changeset
|
1580 } |
785c945f6796
check for -dumpstream file writes, patch by Eric Lammerts <eric@lammerts.org>
alex
parents:
10223
diff
changeset
|
1581 } |
3257 | 1582 } |
10225
785c945f6796
check for -dumpstream file writes, patch by Eric Lammerts <eric@lammerts.org>
alex
parents:
10223
diff
changeset
|
1583 if(fclose(f)) { |
785c945f6796
check for -dumpstream file writes, patch by Eric Lammerts <eric@lammerts.org>
alex
parents:
10223
diff
changeset
|
1584 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
|
1585 exit_player(MSGTR_Exit_error); |
785c945f6796
check for -dumpstream file writes, patch by Eric Lammerts <eric@lammerts.org>
alex
parents:
10223
diff
changeset
|
1586 } |
3257 | 1587 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
|
1588 exit_player_with_rc(MSGTR_Exit_eof, 0); |
3257 | 1589 } |
1590 | |
4274 | 1591 #ifdef USE_DVDREAD |
5425 | 1592 if(stream->type==STREAMTYPE_DVD){ |
1593 current_module="dvd lang->id"; | |
10550
7860a71ba82c
For a request by Gabu, i've cut & fix a part of Joey's dvd aid switching
gabucino
parents:
10521
diff
changeset
|
1594 if(audio_id==-1) audio_id=dvd_aid_from_lang(stream,audio_lang); |
5425 | 1595 if(dvdsub_lang && dvdsub_id==-1) dvdsub_id=dvd_sid_from_lang(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
|
1596 // setup global sub numbering |
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
|
1597 global_sub_indices[SUB_SOURCE_DEMUX] = global_sub_size; // the global # of the first demux-specific sub. |
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
|
1598 global_sub_size += dvd_number_of_subs(stream); |
5425 | 1599 current_module=NULL; |
1600 } | |
4274 | 1601 #endif |
1602 | |
5489
5e6e08ff47d5
dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents:
5488
diff
changeset
|
1603 #ifdef USE_DVDNAV |
9752 | 1604 if (stream->type==STREAMTYPE_DVDNAV) stream_cache_size=0; // must disable caching... |
5489
5e6e08ff47d5
dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents:
5488
diff
changeset
|
1605 #endif |
5e6e08ff47d5
dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents:
5488
diff
changeset
|
1606 |
5151 | 1607 // CACHE2: initial prefill: 20% later: 5% (should be set by -cacheopts) |
11580
90953d955165
Fontconfig support based on patch by Arwed von Merkatz <v.merkatz@gmx.net>, but slightly reworked
alex
parents:
11542
diff
changeset
|
1608 #ifdef HAS_DVBIN_SUPPORT |
11352 | 1609 goto_enable_cache: |
11580
90953d955165
Fontconfig support based on patch by Arwed von Merkatz <v.merkatz@gmx.net>, but slightly reworked
alex
parents:
11542
diff
changeset
|
1610 #endif |
7881
aba9301ed3c4
allow cache to be disabled (-nocache should override cachesize autodetection
arpi
parents:
7867
diff
changeset
|
1611 if(stream_cache_size>0){ |
5151 | 1612 current_module="enable_cache"; |
12835
4235ae5a2d60
cache min fill adjustment, based on patch by Jeremy Huddleston
iive
parents:
12816
diff
changeset
|
1613 if(!stream_enable_cache(stream,stream_cache_size*1024,stream_cache_size*1024*(stream_cache_min_percent / 100.0),stream_cache_size*1024*(stream_cache_prefill_percent / 100.0))) |
5151 | 1614 if((eof = libmpdemux_was_interrupted(PT_NEXT_ENTRY))) goto goto_next_file; |
1615 } | |
1639 | 1616 |
5151 | 1617 //============ Open DEMUXERS --- DETECT file type ======================= |
1639 | 1618 current_module="demux_open"; |
1619 | |
9006
d00997f12257
extension-based filetype detection for headerless files (mp3 vs mpeg, etc)
arpi
parents:
9003
diff
changeset
|
1620 demuxer=demux_open(stream,file_format,audio_id,video_id,dvdsub_id,filename); |
8937 | 1621 |
1622 // HACK to get MOV Reference Files working | |
1623 | |
1624 if (demuxer && demuxer->type==DEMUXER_TYPE_PLAYLIST) | |
1625 { | |
1626 unsigned char* playlist_entry; | |
1627 play_tree_t *list = NULL, *entry = NULL; | |
1628 | |
1629 current_module="handle_demux_playlist"; | |
1630 while (ds_get_packet(demuxer->video,&playlist_entry)>0) | |
1631 { | |
1632 char *temp, *bname; | |
1633 | |
13577 | 1634 mp_msg(MSGT_CPLAYER,MSGL_V,"Adding file %s to element entry.\n",playlist_entry); |
8937 | 1635 |
1636 bname=mp_basename(playlist_entry); | |
1637 if ((strlen(bname)>10) && !strncmp(bname,"qt",2) && !strncmp(bname+3,"gateQT",6)) | |
1638 continue; | |
1639 | |
9124
ff773800b598
I also added that a self-reference is not endlessly played ... (Happened
arpi
parents:
9105
diff
changeset
|
1640 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
|
1641 continue; |
ff773800b598
I also added that a self-reference is not endlessly played ... (Happened
arpi
parents:
9105
diff
changeset
|
1642 |
8937 | 1643 entry = play_tree_new(); |
1644 | |
1645 if (filename && !strcmp(mp_basename(playlist_entry),playlist_entry)) // add reference path of current file | |
1646 { | |
1647 temp=malloc((strlen(filename)-strlen(mp_basename(filename))+strlen(playlist_entry)+1)*sizeof(char)); | |
1648 if (temp) | |
1649 { | |
1650 strncpy(temp, filename, strlen(filename)-strlen(mp_basename(filename))); | |
1651 temp[strlen(filename)-strlen(mp_basename(filename))]='\0'; | |
1652 strcat(temp, playlist_entry); | |
1653 play_tree_add_file(entry,temp); | |
13577 | 1654 mp_msg(MSGT_CPLAYER,MSGL_V,"Resolving reference to %s.\n",temp); |
8937 | 1655 free(temp); |
1656 } | |
1657 } | |
1658 else | |
1659 play_tree_add_file(entry,playlist_entry); | |
1660 | |
1661 if(!list) | |
1662 list = entry; | |
1663 else | |
1664 play_tree_append_entry(list,entry); | |
1665 } | |
1666 free_demuxer(demuxer); | |
1667 demuxer = NULL; | |
1668 | |
1669 if (list) | |
1670 { | |
1671 entry = play_tree_new(); | |
1672 play_tree_set_child(entry,list); | |
1673 eof=playtree_add_playlist(entry); | |
1674 goto goto_next_file; | |
1675 } | |
1676 } | |
1677 | |
8925
5c15777f1c07
this patch adds an fallback to playlist (any but the plaintext-list format)
arpi
parents:
8913
diff
changeset
|
1678 if(!demuxer) |
5c15777f1c07
this patch adds an fallback to playlist (any but the plaintext-list format)
arpi
parents:
8913
diff
changeset
|
1679 { |
10953
70a974306f9b
disable code that DOES NOT WORK (it won't load real playlists and
rfelker
parents:
10928
diff
changeset
|
1680 #if 0 |
8925
5c15777f1c07
this patch adds an fallback to playlist (any but the plaintext-list format)
arpi
parents:
8913
diff
changeset
|
1681 play_tree_t* entry; |
5c15777f1c07
this patch adds an fallback to playlist (any but the plaintext-list format)
arpi
parents:
8913
diff
changeset
|
1682 // Handle playlist |
5c15777f1c07
this patch adds an fallback to playlist (any but the plaintext-list format)
arpi
parents:
8913
diff
changeset
|
1683 current_module="handle_playlist"; |
9090 | 1684 switch(stream->type){ |
1685 case STREAMTYPE_VCD: | |
1686 case STREAMTYPE_DVD: | |
1687 case STREAMTYPE_DVDNAV: | |
1688 case STREAMTYPE_CDDA: | |
1689 case STREAMTYPE_VCDBINCUE: | |
1690 // don't try to parse raw media as playlist, it's unlikely | |
1691 goto goto_next_file; | |
1692 } | |
13577 | 1693 mp_msg(MSGT_CPLAYER,MSGL_INFO,MSGTR_FallingBackOnPlaylist,filename); |
8925
5c15777f1c07
this patch adds an fallback to playlist (any but the plaintext-list format)
arpi
parents:
8913
diff
changeset
|
1694 stream_reset(stream); |
5c15777f1c07
this patch adds an fallback to playlist (any but the plaintext-list format)
arpi
parents:
8913
diff
changeset
|
1695 stream_seek(stream,stream->start_pos); |
5c15777f1c07
this patch adds an fallback to playlist (any but the plaintext-list format)
arpi
parents:
8913
diff
changeset
|
1696 entry = parse_playtree(stream,0); |
5c15777f1c07
this patch adds an fallback to playlist (any but the plaintext-list format)
arpi
parents:
8913
diff
changeset
|
1697 if(!entry) |
5c15777f1c07
this patch adds an fallback to playlist (any but the plaintext-list format)
arpi
parents:
8913
diff
changeset
|
1698 mp_msg(MSGT_DEMUXER,MSGL_ERR,MSGTR_FormatNotRecognized); |
5c15777f1c07
this patch adds an fallback to playlist (any but the plaintext-list format)
arpi
parents:
8913
diff
changeset
|
1699 else |
5c15777f1c07
this patch adds an fallback to playlist (any but the plaintext-list format)
arpi
parents:
8913
diff
changeset
|
1700 eof=playtree_add_playlist(entry); |
10953
70a974306f9b
disable code that DOES NOT WORK (it won't load real playlists and
rfelker
parents:
10928
diff
changeset
|
1701 #endif |
8925
5c15777f1c07
this patch adds an fallback to playlist (any but the plaintext-list format)
arpi
parents:
8913
diff
changeset
|
1702 goto goto_next_file; |
5c15777f1c07
this patch adds an fallback to playlist (any but the plaintext-list format)
arpi
parents:
8913
diff
changeset
|
1703 } |
7058
2e5c07262861
new v4l capture patch by Jindrich Makovicka <makovick@kmlinux.fjfi.cvut.cz>:
arpi
parents:
7055
diff
changeset
|
1704 inited_flags|=INITED_DEMUXER; |
2e5c07262861
new v4l capture patch by Jindrich Makovicka <makovick@kmlinux.fjfi.cvut.cz>:
arpi
parents:
7055
diff
changeset
|
1705 |
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
|
1706 #ifdef HAVE_MATROSKA |
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
|
1707 if (demuxer->type==DEMUXER_TYPE_MATROSKA) { |
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
|
1708 // setup global sub numbering |
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
|
1709 global_sub_indices[SUB_SOURCE_DEMUX] = global_sub_size; // the global # of the first demux-specific sub. |
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
|
1710 global_sub_size += demux_mkv_num_subs(demuxer); |
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
|
1711 } |
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
|
1712 #endif |
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
|
1713 #ifdef HAVE_OGGVORBIS |
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
|
1714 if (demuxer->type==DEMUXER_TYPE_OGG) { |
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
|
1715 // setup global sub numbering |
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
|
1716 global_sub_indices[SUB_SOURCE_DEMUX] = global_sub_size; // the global # of the first demux-specific sub. |
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
|
1717 global_sub_size += demux_ogg_num_subs(demuxer); |
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
|
1718 } |
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
|
1719 #endif |
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
|
1720 |
5175
8354d89498d4
video codec selection redesigned and moved to libmpcodecs - now it's 'intelligent'
arpi
parents:
5154
diff
changeset
|
1721 current_module="demux_open2"; |
8354d89498d4
video codec selection redesigned and moved to libmpcodecs - now it's 'intelligent'
arpi
parents:
5154
diff
changeset
|
1722 |
1660 | 1723 //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
|
1724 |
1 | 1725 d_audio=demuxer->audio; |
1726 d_video=demuxer->video; | |
554 | 1727 d_dvdsub=demuxer->sub; |
1 | 1728 |
792 | 1729 // DUMP STREAMS: |
6209 | 1730 if((stream_dump_type)&&(stream_dump_type<4)){ |
792 | 1731 FILE *f; |
1732 demux_stream_t *ds=NULL; | |
1639 | 1733 current_module="dump"; |
792 | 1734 // select stream to dump |
1735 switch(stream_dump_type){ | |
1736 case 1: ds=d_audio;break; | |
1737 case 2: ds=d_video;break; | |
4335 | 1738 case 3: ds=d_dvdsub;break; |
792 | 1739 } |
1740 if(!ds){ | |
7805 | 1741 mp_msg(MSGT_CPLAYER,MSGL_FATAL,MSGTR_DumpSelectedStreamMissing); |
1639 | 1742 exit_player(MSGTR_Exit_error); |
792 | 1743 } |
1744 // disable other streams: | |
1745 if(d_audio && d_audio!=ds) {ds_free_packs(d_audio); d_audio->id=-2; } | |
1746 if(d_video && d_video!=ds) {ds_free_packs(d_video); d_video->id=-2; } | |
1747 if(d_dvdsub && d_dvdsub!=ds) {ds_free_packs(d_dvdsub); d_dvdsub->id=-2; } | |
1748 // let's dump it! | |
3257 | 1749 f=fopen(stream_dump_name,"wb"); |
1639 | 1750 if(!f){ |
1751 mp_msg(MSGT_CPLAYER,MSGL_FATAL,MSGTR_CantOpenDumpfile); | |
1752 exit_player(MSGTR_Exit_error); | |
1753 } | |
792 | 1754 while(!ds->eof){ |
1755 unsigned char* start; | |
1756 int in_size=ds_get_packet(ds,&start); | |
2102 | 1757 if( (demuxer->file_format==DEMUXER_TYPE_AVI || demuxer->file_format==DEMUXER_TYPE_ASF || 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
|
1758 && stream_dump_type==2) fwrite(&in_size,1,4,f); |
792 | 1759 if(in_size>0) fwrite(start,in_size,1,f); |
1760 } | |
1761 fclose(f); | |
1582 | 1762 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
|
1763 exit_player_with_rc(MSGTR_Exit_eof, 0); |
792 | 1764 } |
1765 | |
1375
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1369
diff
changeset
|
1766 sh_audio=d_audio->sh; |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1369
diff
changeset
|
1767 sh_video=d_video->sh; |
792 | 1768 |
1375
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1369
diff
changeset
|
1769 if(sh_video){ |
1 | 1770 |
5151 | 1771 current_module="video_read_properties"; |
4587
886bf5274992
Audio only support. Include a fix in the asf demuxer opening.
albeu
parents:
4552
diff
changeset
|
1772 if(!video_read_properties(sh_video)) { |
7805 | 1773 mp_msg(MSGT_CPLAYER,MSGL_ERR,MSGTR_CannotReadVideoProperties); |
4587
886bf5274992
Audio only support. Include a fix in the asf demuxer opening.
albeu
parents:
4552
diff
changeset
|
1774 sh_video=d_video->sh=NULL; |
886bf5274992
Audio only support. Include a fix in the asf demuxer opening.
albeu
parents:
4552
diff
changeset
|
1775 } else { |
6138
523014df7d32
big cosmetics patch, cleanup of messages printed by mplayer and libs.
arpi
parents:
6135
diff
changeset
|
1776 mp_msg(MSGT_CPLAYER,MSGL_V,"[V] filefmt:%d fourcc:0x%X size:%dx%d fps:%5.2f ftime:=%6.4f\n", |
4587
886bf5274992
Audio only support. Include a fix in the asf demuxer opening.
albeu
parents:
4552
diff
changeset
|
1777 demuxer->file_format,sh_video->format, sh_video->disp_w,sh_video->disp_h, |
886bf5274992
Audio only support. Include a fix in the asf demuxer opening.
albeu
parents:
4552
diff
changeset
|
1778 sh_video->fps,sh_video->frametime |
886bf5274992
Audio only support. Include a fix in the asf demuxer opening.
albeu
parents:
4552
diff
changeset
|
1779 ); |
1 | 1780 |
4598 | 1781 /* need to set fps here for output encoders to pick it up in their init */ |
1782 if(force_fps){ | |
1783 sh_video->fps=force_fps; | |
1784 sh_video->frametime=1.0f/sh_video->fps; | |
1785 } | |
7562
92188b57a062
video out driver list support (like -vc, example: -vo xmga,xv,x11,)
arpi
parents:
7559
diff
changeset
|
1786 vo_fps = sh_video->fps; |
10661
49d7d02f4485
X11_FULLSCREEN vs HAVE_X11 definitions and some warning fixes
alex
parents:
10646
diff
changeset
|
1787 #ifdef HAVE_X11 |
7562
92188b57a062
video out driver list support (like -vc, example: -vo xmga,xv,x11,)
arpi
parents:
7559
diff
changeset
|
1788 vo_mouse_timer_const=(int)sh_video->fps; |
92188b57a062
video out driver list support (like -vc, example: -vo xmga,xv,x11,)
arpi
parents:
7559
diff
changeset
|
1789 #endif |
4598 | 1790 |
4587
886bf5274992
Audio only support. Include a fix in the asf demuxer opening.
albeu
parents:
4552
diff
changeset
|
1791 if(!sh_video->fps && !force_fps){ |
886bf5274992
Audio only support. Include a fix in the asf demuxer opening.
albeu
parents:
4552
diff
changeset
|
1792 mp_msg(MSGT_CPLAYER,MSGL_ERR,MSGTR_FPSnotspecified); |
886bf5274992
Audio only support. Include a fix in the asf demuxer opening.
albeu
parents:
4552
diff
changeset
|
1793 sh_video=d_video->sh=NULL; |
886bf5274992
Audio only support. Include a fix in the asf demuxer opening.
albeu
parents:
4552
diff
changeset
|
1794 } |
1375
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1369
diff
changeset
|
1795 } |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1369
diff
changeset
|
1796 |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1369
diff
changeset
|
1797 } |
398 | 1798 |
1 | 1799 fflush(stdout); |
1800 | |
4587
886bf5274992
Audio only support. Include a fix in the asf demuxer opening.
albeu
parents:
4552
diff
changeset
|
1801 if(!sh_video && !sh_audio){ |
6930 | 1802 mp_msg(MSGT_CPLAYER,MSGL_FATAL, MSGTR_NoStreamFound); |
10708 | 1803 #ifdef HAS_DVBIN_SUPPORT |
1804 if((stream->type == STREAMTYPE_DVB) && stream->priv) | |
1805 { | |
1806 dvb_priv_t *priv = (dvb_priv_t*) stream->priv; | |
1807 if(priv->is_on) | |
1808 { | |
1809 int dir; | |
1810 int v = last_dvb_step; | |
1811 if(v > 0) | |
1812 dir = DVB_CHANNEL_HIGHER; | |
1813 else | |
1814 dir = DVB_CHANNEL_LOWER; | |
1815 | |
1816 if(dvb_step_channel(priv, dir)) | |
1817 { | |
1818 uninit_player(INITED_ALL-(INITED_STREAM|INITED_INPUT)); | |
11352 | 1819 cache_uninit(stream); |
1820 goto goto_enable_cache; | |
10708 | 1821 } |
1822 } | |
1823 } | |
1824 #endif | |
1641
b7dae998505c
free stream/demuxer. continue playback with next file if error found
arpi
parents:
1639
diff
changeset
|
1825 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
|
1826 } |
13c0dfde813b
removed dummy audio track for -nosound, vo: flip detection
arpi_esp
parents:
766
diff
changeset
|
1827 |
5151 | 1828 /* display clip info */ |
1829 demux_info_print(demuxer); | |
1830 | |
1831 //================== Read SUBTITLES (DVD & TEXT) ========================== | |
14188
0180a7f96197
Hopefully fixes problems with non-working vobsubs.
reimar
parents:
14172
diff
changeset
|
1832 if(vo_spudec==NULL && sh_video && |
0180a7f96197
Hopefully fixes problems with non-working vobsubs.
reimar
parents:
14172
diff
changeset
|
1833 (stream->type==STREAMTYPE_DVD || demuxer->type==DEMUXER_TYPE_MATROSKA || |
0180a7f96197
Hopefully fixes problems with non-working vobsubs.
reimar
parents:
14172
diff
changeset
|
1834 d_dvdsub->id >= 0)){ |
4587
886bf5274992
Audio only support. Include a fix in the asf demuxer opening.
albeu
parents:
4552
diff
changeset
|
1835 |
5388
3af2729c5c87
* New command line switch for mplayer & mencoder:
kmkaplan
parents:
5380
diff
changeset
|
1836 if (spudec_ifo) { |
3af2729c5c87
* New command line switch for mplayer & mencoder:
kmkaplan
parents:
5380
diff
changeset
|
1837 unsigned int palette[16], width, height; |
5489
5e6e08ff47d5
dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents:
5488
diff
changeset
|
1838 current_module="spudec_init_vobsub"; |
6674
f8551f89dd48
MEncoder vobsub ripping support, currently not compatible with windows vobsub, some bugs to be fixed. However it already works with mplayer, so it's a start.
atmos4
parents:
6627
diff
changeset
|
1839 if (vobsub_parse_ifo(NULL,spudec_ifo, palette, &width, &height, 1, -1, NULL) >= 0) |
7790 | 1840 vo_spudec=spudec_new_scaled(palette, width, height); |
5388
3af2729c5c87
* New command line switch for mplayer & mencoder:
kmkaplan
parents:
5380
diff
changeset
|
1841 } |
3af2729c5c87
* New command line switch for mplayer & mencoder:
kmkaplan
parents:
5380
diff
changeset
|
1842 |
5489
5e6e08ff47d5
dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents:
5488
diff
changeset
|
1843 #ifdef USE_DVDNAV |
5e6e08ff47d5
dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents:
5488
diff
changeset
|
1844 if (vo_spudec==NULL && stream->type==STREAMTYPE_DVDNAV) { |
5e6e08ff47d5
dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents:
5488
diff
changeset
|
1845 current_module="spudec_init_dvdnav"; |
5e6e08ff47d5
dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents:
5488
diff
changeset
|
1846 vo_spudec=spudec_new_scaled(dvdnav_stream_get_palette((dvdnav_priv_t*)(stream->priv)), |
4087 | 1847 sh_video->disp_w, sh_video->disp_h); |
5411 | 1848 } |
1849 #endif | |
5489
5e6e08ff47d5
dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents:
5488
diff
changeset
|
1850 |
5e6e08ff47d5
dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents:
5488
diff
changeset
|
1851 #ifdef USE_DVDREAD |
5e6e08ff47d5
dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents:
5488
diff
changeset
|
1852 if (vo_spudec==NULL && stream->type==STREAMTYPE_DVD) { |
5e6e08ff47d5
dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents:
5488
diff
changeset
|
1853 current_module="spudec_init_dvdread"; |
5e6e08ff47d5
dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents:
5488
diff
changeset
|
1854 vo_spudec=spudec_new_scaled(((dvd_priv_t *)(stream->priv))->cur_pgc->palette, |
5e6e08ff47d5
dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents:
5488
diff
changeset
|
1855 sh_video->disp_w, sh_video->disp_h); |
5e6e08ff47d5
dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents:
5488
diff
changeset
|
1856 } |
5e6e08ff47d5
dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents:
5488
diff
changeset
|
1857 #endif |
5e6e08ff47d5
dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents:
5488
diff
changeset
|
1858 |
11153
cb82b062188f
Support for VobSub-in-Matroska; parts outside of demux_mkv.cpp.
mosu
parents:
10997
diff
changeset
|
1859 #ifdef HAVE_MATROSKA |
cb82b062188f
Support for VobSub-in-Matroska; parts outside of demux_mkv.cpp.
mosu
parents:
10997
diff
changeset
|
1860 if ((vo_spudec == NULL) && (demuxer->type == DEMUXER_TYPE_MATROSKA) && |
cb82b062188f
Support for VobSub-in-Matroska; parts outside of demux_mkv.cpp.
mosu
parents:
10997
diff
changeset
|
1861 (d_dvdsub->sh != NULL) && (((mkv_sh_sub_t *)d_dvdsub->sh)->type == 'v')) { |
12550
733c9d9882d1
Support for the "custom colors" and "forced subtitles" entries in the VobSub idx. Made the parser handle whitespaces better.
mosu
parents:
12360
diff
changeset
|
1862 mkv_sh_sub_t *mkv_sh_sub = (mkv_sh_sub_t *)d_dvdsub->sh; |
11153
cb82b062188f
Support for VobSub-in-Matroska; parts outside of demux_mkv.cpp.
mosu
parents:
10997
diff
changeset
|
1863 current_module = "spudec_init_matroska"; |
12550
733c9d9882d1
Support for the "custom colors" and "forced subtitles" entries in the VobSub idx. Made the parser handle whitespaces better.
mosu
parents:
12360
diff
changeset
|
1864 vo_spudec = |
733c9d9882d1
Support for the "custom colors" and "forced subtitles" entries in the VobSub idx. Made the parser handle whitespaces better.
mosu
parents:
12360
diff
changeset
|
1865 spudec_new_scaled_vobsub(mkv_sh_sub->palette, mkv_sh_sub->colors, |
733c9d9882d1
Support for the "custom colors" and "forced subtitles" entries in the VobSub idx. Made the parser handle whitespaces better.
mosu
parents:
12360
diff
changeset
|
1866 mkv_sh_sub->custom_colors, mkv_sh_sub->width, |
733c9d9882d1
Support for the "custom colors" and "forced subtitles" entries in the VobSub idx. Made the parser handle whitespaces better.
mosu
parents:
12360
diff
changeset
|
1867 mkv_sh_sub->height); |
733c9d9882d1
Support for the "custom colors" and "forced subtitles" entries in the VobSub idx. Made the parser handle whitespaces better.
mosu
parents:
12360
diff
changeset
|
1868 forced_subs_only = mkv_sh_sub->forced_subs_only; |
11153
cb82b062188f
Support for VobSub-in-Matroska; parts outside of demux_mkv.cpp.
mosu
parents:
10997
diff
changeset
|
1869 } |
cb82b062188f
Support for VobSub-in-Matroska; parts outside of demux_mkv.cpp.
mosu
parents:
10997
diff
changeset
|
1870 #endif |
cb82b062188f
Support for VobSub-in-Matroska; parts outside of demux_mkv.cpp.
mosu
parents:
10997
diff
changeset
|
1871 |
5489
5e6e08ff47d5
dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents:
5488
diff
changeset
|
1872 if (vo_spudec==NULL) { |
5e6e08ff47d5
dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents:
5488
diff
changeset
|
1873 current_module="spudec_init_normal"; |
5e6e08ff47d5
dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents:
5488
diff
changeset
|
1874 vo_spudec=spudec_new_scaled(NULL, sh_video->disp_w, sh_video->disp_h); |
6110 | 1875 spudec_set_font_factor(vo_spudec,font_factor); |
5489
5e6e08ff47d5
dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents:
5488
diff
changeset
|
1876 } |
5e6e08ff47d5
dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents:
5488
diff
changeset
|
1877 |
4087 | 1878 if (vo_spudec!=NULL) |
1879 inited_flags|=INITED_SPUDEC; | |
4274 | 1880 |
6110 | 1881 } |
1882 | |
10917
d45870f67728
Forced subtitles patch by Arne Driescher <driescher@mpi-magdeburg.mpg.de>
attila
parents:
10884
diff
changeset
|
1883 // Apply current settings for forced subs |
d45870f67728
Forced subtitles patch by Arne Driescher <driescher@mpi-magdeburg.mpg.de>
attila
parents:
10884
diff
changeset
|
1884 if (vo_spudec!=NULL) |
d45870f67728
Forced subtitles patch by Arne Driescher <driescher@mpi-magdeburg.mpg.de>
attila
parents:
10884
diff
changeset
|
1885 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
|
1886 |
4052
505f206d80d1
corrections to adjust_subs_time function which now uses fps if needed
atlka
parents:
4045
diff
changeset
|
1887 #ifdef USE_SUB |
6110 | 1888 if(sh_video) { |
4064
3c747168eb6e
1. subs know are readed after reading AVI header so we already know fps
atlka
parents:
4052
diff
changeset
|
1889 // after reading video params we should load subtitles because |
4052
505f206d80d1
corrections to adjust_subs_time function which now uses fps if needed
atlka
parents:
4045
diff
changeset
|
1890 // we know fps so now we can adjust subtitles 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
|
1891 // check .sub |
5151 | 1892 current_module="read_subtitles_file"; |
1893 if(sub_name){ | |
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9831
diff
changeset
|
1894 for (i = 0; sub_name[i] != NULL; ++i) |
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9831
diff
changeset
|
1895 add_subtitles (sub_name[i], sh_video->fps, 0); |
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9831
diff
changeset
|
1896 } |
5151 | 1897 if(sub_auto) { // auto load sub file ... |
11767 | 1898 char *psub = get_path( "sub/" ); |
1899 char **tmp = sub_filenames((psub ? psub : ""), filename); | |
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9831
diff
changeset
|
1900 char **tmp2 = tmp; |
12890 | 1901 free(psub); // release the buffer created by get_path() above |
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9831
diff
changeset
|
1902 while (*tmp2) |
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9831
diff
changeset
|
1903 add_subtitles (*tmp2++, sh_video->fps, 0); |
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9831
diff
changeset
|
1904 free(tmp); |
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9831
diff
changeset
|
1905 if (set_of_sub_size == 0) |
12893 | 1906 { |
12890 | 1907 add_subtitles (mem_ptr=get_path("default.sub"), sh_video->fps, 1); |
1908 free(mem_ptr); // release the buffer created by get_path() | |
12893 | 1909 } |
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9831
diff
changeset
|
1910 if (set_of_sub_size > 0) |
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9831
diff
changeset
|
1911 add_subtitles (NULL, sh_video->fps, 1); |
4064
3c747168eb6e
1. subs know are readed after reading AVI header so we already know fps
atlka
parents:
4052
diff
changeset
|
1912 } |
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9831
diff
changeset
|
1913 if (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
|
1914 // setup global sub numbering |
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
|
1915 global_sub_indices[SUB_SOURCE_SUBS] = global_sub_size; // the global # of the first sub. |
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
|
1916 global_sub_size += set_of_sub_size; |
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9831
diff
changeset
|
1917 } |
5151 | 1918 } |
6110 | 1919 #endif |
1920 | |
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
|
1921 if (global_sub_size) { |
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
|
1922 // find the best sub to use |
a5004eb92a79
fix sub_select fiasco with global sub numbering. now multiple sub sources can be managed in essentially one list.
joey
parents:
13500
diff
changeset
|
1923 if (vobsub_id >= 0) { |
a5004eb92a79
fix sub_select fiasco with global sub numbering. now multiple sub sources can be managed in essentially one list.
joey
parents:
13500
diff
changeset
|
1924 // if user asks for a vobsub id, use that first. |
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
|
1925 global_sub_pos = global_sub_indices[SUB_SOURCE_VOBSUB] + vobsub_id; |
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
|
1926 } else if (dvdsub_id >= 0 && global_sub_indices[SUB_SOURCE_DEMUX] >= 0) { |
a5004eb92a79
fix sub_select fiasco with global sub numbering. now multiple sub sources can be managed in essentially one list.
joey
parents:
13500
diff
changeset
|
1927 // if user asks for a dvd sub id, use that next. |
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
|
1928 global_sub_pos = global_sub_indices[SUB_SOURCE_DEMUX] + dvdsub_id; |
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
|
1929 } else if (global_sub_indices[SUB_SOURCE_SUBS] >= 0) { |
a5004eb92a79
fix sub_select fiasco with global sub numbering. now multiple sub sources can be managed in essentially one list.
joey
parents:
13500
diff
changeset
|
1930 // if there are text subs to use, use those. (autosubs come last here) |
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
|
1931 global_sub_pos = global_sub_indices[SUB_SOURCE_SUBS]; |
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
|
1932 /* |
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
|
1933 } else if (global_sub_indices[SUB_SOURCE_DEMUX] >= 0) { |
a5004eb92a79
fix sub_select fiasco with global sub numbering. now multiple sub sources can be managed in essentially one list.
joey
parents:
13500
diff
changeset
|
1934 // if nothing else works, get subs from the demuxer. |
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
|
1935 global_sub_pos = global_sub_indices[SUB_SOURCE_DEMUX]; |
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
|
1936 */ |
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
|
1937 } 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
|
1938 // nothing worth doing automatically. |
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
|
1939 global_sub_pos = -1; |
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
|
1940 } |
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
|
1941 // rather than duplicate code, use the SUB_SELECT handler to init the right one. |
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
|
1942 global_sub_pos--; |
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
|
1943 mp_input_queue_cmd(mp_input_parse_cmd("sub_select")); |
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
|
1944 } |
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
|
1945 |
303 | 1946 //================== Init AUDIO (codec) ========================== |
1369
7a2f1881b776
a_frame, v_frame killed, using sh_audio/video->timer. has_audio not more used after initialization.
arpi
parents:
1353
diff
changeset
|
1947 if(sh_audio){ |
303 | 1948 // Go through the codec.conf and find the best codec... |
7502
6a2b6f3d619c
best audio/video codec selection & init moved to libmpcodecs
arpi
parents:
7495
diff
changeset
|
1949 current_module="init_audio_codec"; |
7202
b414c2e34b2e
removed buggy fd<0 check for disallowing dumpstream/cache
arpi
parents:
7201
diff
changeset
|
1950 mp_msg(MSGT_CPLAYER,MSGL_INFO,"==========================================================================\n"); |
7522 | 1951 if(!init_best_audio_codec(sh_audio,audio_codec_list,audio_fm_list)){ |
7502
6a2b6f3d619c
best audio/video codec selection & init moved to libmpcodecs
arpi
parents:
7495
diff
changeset
|
1952 sh_audio=d_audio->sh=NULL; // failed to init :( |
7621
7caeb275ad26
uninit cleanup again... thx to Nilmoni Deb for bugreport
arpi
parents:
7614
diff
changeset
|
1953 } else |
7caeb275ad26
uninit cleanup again... thx to Nilmoni Deb for bugreport
arpi
parents:
7614
diff
changeset
|
1954 inited_flags|=INITED_ACODEC; |
7502
6a2b6f3d619c
best audio/video codec selection & init moved to libmpcodecs
arpi
parents:
7495
diff
changeset
|
1955 mp_msg(MSGT_CPLAYER,MSGL_INFO,"==========================================================================\n"); |
1 | 1956 } |
1957 | |
7864 | 1958 if(identify) { |
1959 mp_msg(MSGT_GLOBAL,MSGL_INFO,"ID_FILENAME=%s\n", filename); | |
1960 if (sh_video) { | |
1961 /* Assume FOURCC if all bytes >= 0x20 (' ') */ | |
1962 if (sh_video->format >= 0x20202020) | |
8672
9065fd98fad3
I've made some changes to the -identify handling. As previously the output
arpi
parents:
8644
diff
changeset
|
1963 mp_msg(MSGT_GLOBAL,MSGL_INFO,"ID_VIDEO_FORMAT=%.4s\n", &sh_video->format); |
7864 | 1964 else |
8672
9065fd98fad3
I've made some changes to the -identify handling. As previously the output
arpi
parents:
8644
diff
changeset
|
1965 mp_msg(MSGT_GLOBAL,MSGL_INFO,"ID_VIDEO_FORMAT=0x%08X\n", sh_video->format); |
7864 | 1966 mp_msg(MSGT_GLOBAL,MSGL_INFO,"ID_VIDEO_BITRATE=%d\n", sh_video->i_bps*8); |
1967 mp_msg(MSGT_GLOBAL,MSGL_INFO,"ID_VIDEO_WIDTH=%d\n", sh_video->disp_w); | |
1968 mp_msg(MSGT_GLOBAL,MSGL_INFO,"ID_VIDEO_HEIGHT=%d\n", sh_video->disp_h); | |
1969 mp_msg(MSGT_GLOBAL,MSGL_INFO,"ID_VIDEO_FPS=%5.3f\n", sh_video->fps); | |
9178
b2bcaf612d5f
The two-digit aspect ratio displayed by -identify is not good enough to
arpi
parents:
9132
diff
changeset
|
1970 mp_msg(MSGT_GLOBAL,MSGL_INFO,"ID_VIDEO_ASPECT=%1.4f\n", sh_video->aspect); |
7864 | 1971 } |
1972 if (sh_audio) { | |
1973 if (sh_audio->codec) | |
1974 mp_msg(MSGT_GLOBAL,MSGL_INFO, "ID_AUDIO_CODEC=%s\n", sh_audio->codec->name); | |
1975 /* Assume FOURCC if all bytes >= 0x20 (' ') */ | |
1976 if (sh_audio->format >= 0x20202020) | |
1977 mp_msg(MSGT_GLOBAL,MSGL_INFO, "ID_AUDIO_FORMAT=%.4s\n", &sh_audio->format); | |
1978 else | |
1979 mp_msg(MSGT_GLOBAL,MSGL_INFO,"ID_AUDIO_FORMAT=%d\n", sh_audio->format); | |
1980 mp_msg(MSGT_GLOBAL,MSGL_INFO,"ID_AUDIO_BITRATE=%d\n", sh_audio->i_bps*8); | |
1981 mp_msg(MSGT_GLOBAL,MSGL_INFO,"ID_AUDIO_RATE=%d\n", sh_audio->samplerate); | |
1982 mp_msg(MSGT_GLOBAL,MSGL_INFO,"ID_AUDIO_NCH=%d\n", sh_audio->channels); | |
1983 } | |
8208
ae5a2ae1c349
demuxer_control(), percent position and time length query implemented in
arpi
parents:
8198
diff
changeset
|
1984 mp_msg(MSGT_GLOBAL,MSGL_INFO,"ID_LENGTH=%ld\n", demuxer_get_time_length(demuxer)); |
7864 | 1985 } |
1986 | |
7502
6a2b6f3d619c
best audio/video codec selection & init moved to libmpcodecs
arpi
parents:
7495
diff
changeset
|
1987 if(!sh_video) goto main; // audio-only |
175 | 1988 |
303 | 1989 //================== Init VIDEO (codec & libvo) ========================== |
7677
33562a65e9e8
_EXPERIMENTAL_ option: -fixed-vo for libvo spec compliance testing
arpi
parents:
7628
diff
changeset
|
1990 if(!fixed_vo || !(inited_flags&INITED_VO)){ |
5154 | 1991 current_module="preinit_libvo"; |
1992 | |
5511 | 1993 vo_config_count=0; |
7562
92188b57a062
video out driver list support (like -vc, example: -vo xmga,xv,x11,)
arpi
parents:
7559
diff
changeset
|
1994 //if((video_out->preinit(vo_subdevice))!=0){ |
92188b57a062
video out driver list support (like -vc, example: -vo xmga,xv,x11,)
arpi
parents:
7559
diff
changeset
|
1995 if(!(video_out=init_best_video_out(video_driver_list))){ |
6930 | 1996 mp_msg(MSGT_CPLAYER,MSGL_FATAL,MSGTR_ErrorInitializingVODevice); |
5154 | 1997 goto goto_next_file; // exit_player(MSGTR_Exit_error); |
1998 } | |
5075 | 1999 sh_video->video_out=video_out; |
5154 | 2000 inited_flags|=INITED_VO; |
7677
33562a65e9e8
_EXPERIMENTAL_ option: -fixed-vo for libvo spec compliance testing
arpi
parents:
7628
diff
changeset
|
2001 } |
5154 | 2002 |
5507
d0d029fda134
video filter layer - written from scratch, but inspired a lot by Fredrik Kuivinen's patch
arpi
parents:
5489
diff
changeset
|
2003 current_module="init_video_filters"; |
9593
e9a2af584986
Add the new -vf option wich is the same as vop in reverse order.
albeu
parents:
9563
diff
changeset
|
2004 { |
e9a2af584986
Add the new -vf option wich is the same as vop in reverse order.
albeu
parents:
9563
diff
changeset
|
2005 char* vf_arg[] = { "_oldargs_", (char*)video_out , NULL }; |
e9a2af584986
Add the new -vf option wich is the same as vop in reverse order.
albeu
parents:
9563
diff
changeset
|
2006 sh_video->vfilter=(void*)vf_open_filter(NULL,"vo",vf_arg); |
e9a2af584986
Add the new -vf option wich is the same as vop in reverse order.
albeu
parents:
9563
diff
changeset
|
2007 } |
8198 | 2008 #ifdef HAVE_MENU |
2009 if(use_menu) { | |
9593
e9a2af584986
Add the new -vf option wich is the same as vop in reverse order.
albeu
parents:
9563
diff
changeset
|
2010 char* vf_arg[] = { "_oldargs_", menu_root, NULL }; |
e9a2af584986
Add the new -vf option wich is the same as vop in reverse order.
albeu
parents:
9563
diff
changeset
|
2011 vf_menu = vf_open_plugin(libmenu_vfs,sh_video->vfilter,"menu",vf_arg); |
8198 | 2012 if(!vf_menu) { |
13577 | 2013 mp_msg(MSGT_CPLAYER,MSGL_ERR,MSGTR_CantOpenLibmenuFilterWithThisRootMenu,menu_root); |
8198 | 2014 use_menu = 0; |
2015 } | |
2016 } | |
2017 if(vf_menu) | |
2018 sh_video->vfilter=(void*)append_filters(vf_menu); | |
2019 else | |
2020 #endif | |
7559
b645204ea527
some cleanup - made private vars/funcs static, removed obsolete externs
arpi
parents:
7529
diff
changeset
|
2021 sh_video->vfilter=(void*)append_filters(sh_video->vfilter); |
5507
d0d029fda134
video filter layer - written from scratch, but inspired a lot by Fredrik Kuivinen's patch
arpi
parents:
5489
diff
changeset
|
2022 |
5154 | 2023 current_module="init_video_codec"; |
303 | 2024 |
5175
8354d89498d4
video codec selection redesigned and moved to libmpcodecs - now it's 'intelligent'
arpi
parents:
5154
diff
changeset
|
2025 mp_msg(MSGT_CPLAYER,MSGL_INFO,"==========================================================================\n"); |
7506
c1cb94198e05
-vc/-vfm accepts codec/driver _list_ now. empty list element for -vc means
arpi
parents:
7502
diff
changeset
|
2026 init_best_video_codec(sh_video,video_codec_list,video_fm_list); |
7502
6a2b6f3d619c
best audio/video codec selection & init moved to libmpcodecs
arpi
parents:
7495
diff
changeset
|
2027 mp_msg(MSGT_CPLAYER,MSGL_INFO,"==========================================================================\n"); |
5175
8354d89498d4
video codec selection redesigned and moved to libmpcodecs - now it's 'intelligent'
arpi
parents:
5154
diff
changeset
|
2028 |
8354d89498d4
video codec selection redesigned and moved to libmpcodecs - now it's 'intelligent'
arpi
parents:
5154
diff
changeset
|
2029 if(!sh_video->inited){ |
7677
33562a65e9e8
_EXPERIMENTAL_ option: -fixed-vo for libvo spec compliance testing
arpi
parents:
7628
diff
changeset
|
2030 if(!fixed_vo) uninit_player(INITED_VO); |
5175
8354d89498d4
video codec selection redesigned and moved to libmpcodecs - now it's 'intelligent'
arpi
parents:
5154
diff
changeset
|
2031 if(!sh_audio) goto goto_next_file; |
8354d89498d4
video codec selection redesigned and moved to libmpcodecs - now it's 'intelligent'
arpi
parents:
5154
diff
changeset
|
2032 sh_video = d_video->sh = NULL; |
8354d89498d4
video codec selection redesigned and moved to libmpcodecs - now it's 'intelligent'
arpi
parents:
5154
diff
changeset
|
2033 goto main; // exit_player(MSGTR_Exit_error); |
8354d89498d4
video codec selection redesigned and moved to libmpcodecs - now it's 'intelligent'
arpi
parents:
5154
diff
changeset
|
2034 } |
8354d89498d4
video codec selection redesigned and moved to libmpcodecs - now it's 'intelligent'
arpi
parents:
5154
diff
changeset
|
2035 |
7621
7caeb275ad26
uninit cleanup again... thx to Nilmoni Deb for bugreport
arpi
parents:
7614
diff
changeset
|
2036 inited_flags|=INITED_VCODEC; |
7caeb275ad26
uninit cleanup again... thx to Nilmoni Deb for bugreport
arpi
parents:
7614
diff
changeset
|
2037 |
1439 | 2038 if(auto_quality>0){ |
2039 // Auto quality option enabled | |
2040 output_quality=get_video_quality_max(sh_video); | |
2041 if(auto_quality>output_quality) auto_quality=output_quality; | |
2042 else output_quality=auto_quality; | |
13577 | 2043 mp_msg(MSGT_CPLAYER,MSGL_V,"AutoQ: setting quality to %d.\n",output_quality); |
1439 | 2044 set_video_quality(sh_video,output_quality); |
2045 } | |
2046 | |
398 | 2047 // ========== Init display (sh_video->disp_w*sh_video->disp_h/out_fmt) ============ |
1 | 2048 |
6781 | 2049 current_module="init_vo"; |
6755 | 2050 |
6110 | 2051 if(vo_flags & 0x08 && vo_spudec) |
2052 spudec_set_hw_spu(vo_spudec,video_out); | |
2053 | |
7122
0dc9cb756b68
freetype 2.0/2.1+ support - disabled by default until bugs fixed
arpi
parents:
7111
diff
changeset
|
2054 #ifdef HAVE_FREETYPE |
0dc9cb756b68
freetype 2.0/2.1+ support - disabled by default until bugs fixed
arpi
parents:
7111
diff
changeset
|
2055 force_load_font = 1; |
0dc9cb756b68
freetype 2.0/2.1+ support - disabled by default until bugs fixed
arpi
parents:
7111
diff
changeset
|
2056 #endif |
0dc9cb756b68
freetype 2.0/2.1+ support - disabled by default until bugs fixed
arpi
parents:
7111
diff
changeset
|
2057 |
1 | 2058 //================== MAIN: ========================== |
7502
6a2b6f3d619c
best audio/video codec selection & init moved to libmpcodecs
arpi
parents:
7495
diff
changeset
|
2059 main: |
6a2b6f3d619c
best audio/video codec selection & init moved to libmpcodecs
arpi
parents:
7495
diff
changeset
|
2060 current_module="main"; |
6a2b6f3d619c
best audio/video codec selection & init moved to libmpcodecs
arpi
parents:
7495
diff
changeset
|
2061 |
7516
657041b7236b
when working through a mixed play tree with audi-only files and video files
arpi
parents:
7506
diff
changeset
|
2062 // If there is no video OSD has to be disabled. |
657041b7236b
when working through a mixed play tree with audi-only files and video files
arpi
parents:
7506
diff
changeset
|
2063 // In case of playing a playtree we have to restore the |
657041b7236b
when working through a mixed play tree with audi-only files and video files
arpi
parents:
7506
diff
changeset
|
2064 // old OSD level after playing one or more audio-only files. |
9304 | 2065 if(!sh_video && osd_level >= 0) { // save OSD level only once |
7516
657041b7236b
when working through a mixed play tree with audi-only files and video files
arpi
parents:
7506
diff
changeset
|
2066 osd_level_saved = osd_level; |
657041b7236b
when working through a mixed play tree with audi-only files and video files
arpi
parents:
7506
diff
changeset
|
2067 osd_level = 0; |
657041b7236b
when working through a mixed play tree with audi-only files and video files
arpi
parents:
7506
diff
changeset
|
2068 } else if (osd_level_saved > -1) { // if there is a saved OSD level, restore it |
657041b7236b
when working through a mixed play tree with audi-only files and video files
arpi
parents:
7506
diff
changeset
|
2069 osd_level = osd_level_saved; |
657041b7236b
when working through a mixed play tree with audi-only files and video files
arpi
parents:
7506
diff
changeset
|
2070 osd_level_saved = -1; |
657041b7236b
when working through a mixed play tree with audi-only files and video files
arpi
parents:
7506
diff
changeset
|
2071 } |
5151 | 2072 |
5154 | 2073 fflush(stdout); |
5151 | 2074 |
5789 | 2075 #ifdef HAVE_NEW_GUI |
2076 if ( use_gui ) | |
2077 { | |
2078 if ( sh_audio ) guiIntfStruct.AudioType=sh_audio->channels; else guiIntfStruct.AudioType=0; | |
6796 | 2079 if ( !sh_video && sh_audio ) guiGetEvent( guiSetAudioOnly,(char *)1 ); else guiGetEvent( guiSetAudioOnly,(char *)0 ); |
7009 | 2080 guiGetEvent( guiSetFileFormat,(char *)demuxer->file_format ); |
2081 if ( guiGetEvent( guiSetValues,(char *)sh_video ) ) goto goto_next_file; | |
8312
ef8c992672f4
- audio track handling in menu (idea from R«ädiger Kuhlmann)
pontscho
parents:
8311
diff
changeset
|
2082 guiGetEvent( guiSetDemuxer,(char *)demuxer ); |
5789 | 2083 } |
2084 #endif | |
2085 | |
1 | 2086 { |
1420 | 2087 //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
|
2088 //float v_frame=0; // Video |
1 | 2089 float time_frame=0; // Timer |
1400 | 2090 //float num_frames=0; // number of frames played |
1382 | 2091 int grab_frames=0; |
212 | 2092 char osd_text_buffer[64]; |
10116
add63fea61ac
new slave mode command to show text via osd, patch by Lars Gemeinhardt <lars.gemeinhardt at searchbroker.de> (reviewed by albeu)
faust3
parents:
10053
diff
changeset
|
2093 char osd_show_text_buffer[64]; |
5612
027568c0f982
new -framedrop code - works much better than the old one
arpi
parents:
5610
diff
changeset
|
2094 int drop_frame=0; // current dropping status |
027568c0f982
new -framedrop code - works much better than the old one
arpi
parents:
5610
diff
changeset
|
2095 int dropped_frames=0; // how many frames dropped since last non-dropped frame |
2889
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
2096 int too_slow_frame_cnt=0; |
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
2097 int too_fast_frame_cnt=0; |
1439 | 2098 // for auto-quality: |
1478
6f9167f0fcca
'too slow' message is fixed - better detection now based on both drop_cnt and A-V sync
arpi
parents:
1467
diff
changeset
|
2099 float AV_delay=0; // average of A-V timestamp differences |
1439 | 2100 double vdecode_time; |
6028
bd016664dc18
UMRs fixed - noticed by Nilmoni Deb <ndeb@ece.cmu.edu>
arpi
parents:
6016
diff
changeset
|
2101 unsigned int lastframeout_ts=0; |
8254
772d6d27fd66
warning patch by (Dominik Mierzejewski <dominik at rangers dot eu dot org>)
michael
parents:
8208
diff
changeset
|
2102 /*float time_frame_corr_avg=0;*/ /* unused */ |
1 | 2103 |
5929
9e7d54e7be58
- frame_time delayed one frame, as it's really duration of current frame,
arpi
parents:
5927
diff
changeset
|
2104 float next_frame_time=0; |
9e7d54e7be58
- frame_time delayed one frame, as it's really duration of current frame,
arpi
parents:
5927
diff
changeset
|
2105 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
|
2106 int blit_frame=0; |
9e7d54e7be58
- frame_time delayed one frame, as it's really duration of current frame,
arpi
parents:
5927
diff
changeset
|
2107 |
6028
bd016664dc18
UMRs fixed - noticed by Nilmoni Deb <ndeb@ece.cmu.edu>
arpi
parents:
6016
diff
changeset
|
2108 osd_text_buffer[0]=0; |
bd016664dc18
UMRs fixed - noticed by Nilmoni Deb <ndeb@ece.cmu.edu>
arpi
parents:
6016
diff
changeset
|
2109 |
1 | 2110 //================ SETUP AUDIO ========================== |
2111 | |
1369
7a2f1881b776
a_frame, v_frame killed, using sh_audio/video->timer. has_audio not more used after initialization.
arpi
parents:
1353
diff
changeset
|
2112 if(sh_audio){ |
7563
e9e4398029de
audio out driver list support (example: -ao alsa9,sdl:esd,oss,sdl:oss,)
arpi
parents:
7562
diff
changeset
|
2113 //const ao_info_t *info=audio_out->info; |
8995
865cbed58cf8
2-pass libaf initialization to get better filter chain.
arpi
parents:
8966
diff
changeset
|
2114 current_module="af_preinit"; |
865cbed58cf8
2-pass libaf initialization to get better filter chain.
arpi
parents:
8966
diff
changeset
|
2115 ao_data.samplerate=force_srate?force_srate:sh_audio->samplerate*playback_speed; |
865cbed58cf8
2-pass libaf initialization to get better filter chain.
arpi
parents:
8966
diff
changeset
|
2116 ao_data.channels=audio_output_channels?audio_output_channels:sh_audio->channels; |
865cbed58cf8
2-pass libaf initialization to get better filter chain.
arpi
parents:
8966
diff
changeset
|
2117 ao_data.format=audio_output_format?audio_output_format:sh_audio->sample_format; |
865cbed58cf8
2-pass libaf initialization to get better filter chain.
arpi
parents:
8966
diff
changeset
|
2118 #if 1 |
865cbed58cf8
2-pass libaf initialization to get better filter chain.
arpi
parents:
8966
diff
changeset
|
2119 if(!preinit_audio_filters(sh_audio, |
865cbed58cf8
2-pass libaf initialization to get better filter chain.
arpi
parents:
8966
diff
changeset
|
2120 // input: |
865cbed58cf8
2-pass libaf initialization to get better filter chain.
arpi
parents:
8966
diff
changeset
|
2121 (int)(sh_audio->samplerate*playback_speed), |
865cbed58cf8
2-pass libaf initialization to get better filter chain.
arpi
parents:
8966
diff
changeset
|
2122 sh_audio->channels, sh_audio->sample_format, sh_audio->samplesize, |
865cbed58cf8
2-pass libaf initialization to get better filter chain.
arpi
parents:
8966
diff
changeset
|
2123 // output: |
865cbed58cf8
2-pass libaf initialization to get better filter chain.
arpi
parents:
8966
diff
changeset
|
2124 &ao_data.samplerate, &ao_data.channels, &ao_data.format, |
14245 | 2125 af_fmt2bits(ao_data.format)/8)){ |
13577 | 2126 mp_msg(MSGT_CPLAYER,MSGL_ERR,MSGTR_AudioFilterChainPreinitError); |
8995
865cbed58cf8
2-pass libaf initialization to get better filter chain.
arpi
parents:
8966
diff
changeset
|
2127 } else { |
14245 | 2128 char buf[128]; |
8995
865cbed58cf8
2-pass libaf initialization to get better filter chain.
arpi
parents:
8966
diff
changeset
|
2129 mp_msg(MSGT_CPLAYER,MSGL_INFO,"AF_pre: %dHz %dch %s\n", |
865cbed58cf8
2-pass libaf initialization to get better filter chain.
arpi
parents:
8966
diff
changeset
|
2130 ao_data.samplerate, ao_data.channels, |
14255
137896e25c24
100l, buf etc. in af_fmt2str call are already pointers...
reimar
parents:
14254
diff
changeset
|
2131 af_fmt2str(ao_data.format, buf, 128)); |
8995
865cbed58cf8
2-pass libaf initialization to get better filter chain.
arpi
parents:
8966
diff
changeset
|
2132 } |
865cbed58cf8
2-pass libaf initialization to get better filter chain.
arpi
parents:
8966
diff
changeset
|
2133 #endif |
7563
e9e4398029de
audio out driver list support (example: -ao alsa9,sdl:esd,oss,sdl:oss,)
arpi
parents:
7562
diff
changeset
|
2134 current_module="ao2_init"; |
e9e4398029de
audio out driver list support (example: -ao alsa9,sdl:esd,oss,sdl:oss,)
arpi
parents:
7562
diff
changeset
|
2135 if(!(audio_out=init_best_audio_out(audio_driver_list, |
14254 | 2136 0, // plugin flag |
8996 | 2137 force_srate?force_srate:ao_data.samplerate, |
2138 audio_output_channels?audio_output_channels:ao_data.channels, | |
2139 audio_output_format?audio_output_format:ao_data.format,0))){ | |
7563
e9e4398029de
audio out driver list support (example: -ao alsa9,sdl:esd,oss,sdl:oss,)
arpi
parents:
7562
diff
changeset
|
2140 // FAILED: |
e9e4398029de
audio out driver list support (example: -ao alsa9,sdl:esd,oss,sdl:oss,)
arpi
parents:
7562
diff
changeset
|
2141 mp_msg(MSGT_CPLAYER,MSGL_ERR,MSGTR_CannotInitAO); |
7621
7caeb275ad26
uninit cleanup again... thx to Nilmoni Deb for bugreport
arpi
parents:
7614
diff
changeset
|
2142 uninit_player(INITED_ACODEC); // close codec |
7563
e9e4398029de
audio out driver list support (example: -ao alsa9,sdl:esd,oss,sdl:oss,)
arpi
parents:
7562
diff
changeset
|
2143 sh_audio=d_audio->sh=NULL; // -> nosound |
e9e4398029de
audio out driver list support (example: -ao alsa9,sdl:esd,oss,sdl:oss,)
arpi
parents:
7562
diff
changeset
|
2144 } else { |
e9e4398029de
audio out driver list support (example: -ao alsa9,sdl:esd,oss,sdl:oss,)
arpi
parents:
7562
diff
changeset
|
2145 // SUCCESS: |
14245 | 2146 char buf[128]; |
7563
e9e4398029de
audio out driver list support (example: -ao alsa9,sdl:esd,oss,sdl:oss,)
arpi
parents:
7562
diff
changeset
|
2147 inited_flags|=INITED_AO; |
8995
865cbed58cf8
2-pass libaf initialization to get better filter chain.
arpi
parents:
8966
diff
changeset
|
2148 mp_msg(MSGT_CPLAYER,MSGL_INFO,"AO: [%s] %dHz %dch %s (%d bps)\n", |
7563
e9e4398029de
audio out driver list support (example: -ao alsa9,sdl:esd,oss,sdl:oss,)
arpi
parents:
7562
diff
changeset
|
2149 audio_out->info->short_name, |
8995
865cbed58cf8
2-pass libaf initialization to get better filter chain.
arpi
parents:
8966
diff
changeset
|
2150 ao_data.samplerate, ao_data.channels, |
14255
137896e25c24
100l, buf etc. in af_fmt2str call are already pointers...
reimar
parents:
14254
diff
changeset
|
2151 af_fmt2str(ao_data.format, buf, 128), |
14245 | 2152 af_fmt2bits(ao_data.format)/8 ); |
13577 | 2153 mp_msg(MSGT_CPLAYER,MSGL_V,"AO: Description: %s\nAO: Author: %s\n", |
7563
e9e4398029de
audio out driver list support (example: -ao alsa9,sdl:esd,oss,sdl:oss,)
arpi
parents:
7562
diff
changeset
|
2154 audio_out->info->name, audio_out->info->author); |
e9e4398029de
audio out driver list support (example: -ao alsa9,sdl:esd,oss,sdl:oss,)
arpi
parents:
7562
diff
changeset
|
2155 if(strlen(audio_out->info->comment) > 0) |
13577 | 2156 mp_msg(MSGT_CPLAYER,MSGL_V,"AO: Comment: %s\n", audio_out->info->comment); |
7604
32efb806436e
aufio filter layer (libaf) integration to libmpcodecs, mplayer and mencoder
arpi
parents:
7582
diff
changeset
|
2157 // init audio filters: |
32efb806436e
aufio filter layer (libaf) integration to libmpcodecs, mplayer and mencoder
arpi
parents:
7582
diff
changeset
|
2158 #if 1 |
32efb806436e
aufio filter layer (libaf) integration to libmpcodecs, mplayer and mencoder
arpi
parents:
7582
diff
changeset
|
2159 current_module="af_init"; |
13710 | 2160 if(!build_afilter_chain(sh_audio, &ao_data)) { |
13577 | 2161 mp_msg(MSGT_CPLAYER,MSGL_ERR,MSGTR_NoMatchingFilter); |
9128
c947458ad326
probably bad fix, but it's reported to fix hwac3 problems appeared in rc3
arpi
parents:
9124
diff
changeset
|
2162 // mp_msg(MSGT_CPLAYER,MSGL_ERR,"Couldn't find matching filter / ao format! -> NOSOUND\n"); |
9045 | 2163 // uninit_player(INITED_ACODEC|INITED_AO); // close codec & ao |
2164 // sh_audio=d_audio->sh=NULL; // -> nosound | |
7604
32efb806436e
aufio filter layer (libaf) integration to libmpcodecs, mplayer and mencoder
arpi
parents:
7582
diff
changeset
|
2165 } |
32efb806436e
aufio filter layer (libaf) integration to libmpcodecs, mplayer and mencoder
arpi
parents:
7582
diff
changeset
|
2166 #endif |
1 | 2167 } |
12672
9709ce101949
New 'Mixer API' with ability to change volume through libaf (this part was written by Reimar Doffinger) and lesser global variables
alex
parents:
12550
diff
changeset
|
2168 mixer.audio_out = audio_out; |
13098
907fe1fdfc6c
Make the stepsize of volume changes, changeable by a commandline paarameter
attila
parents:
13094
diff
changeset
|
2169 mixer.volstep = volstep; |
1 | 2170 } |
2171 | |
5151 | 2172 current_module="av_init"; |
2173 | |
2174 if(sh_video) sh_video->timer=0; | |
8056
324b6e5387be
A-V sync cleanup: sh_audio->timer replaced by sh_audio->delay, it contains
arpi
parents:
8030
diff
changeset
|
2175 if(sh_audio) sh_audio->delay=-audio_delay; |
1 | 2176 |
1369
7a2f1881b776
a_frame, v_frame killed, using sh_audio/video->timer. has_audio not more used after initialization.
arpi
parents:
1353
diff
changeset
|
2177 if(!sh_audio){ |
1973
5216f108cb4f
all error/warn/info messages moved to help_mp-en.h for translation
arpi
parents:
1962
diff
changeset
|
2178 mp_msg(MSGT_CPLAYER,MSGL_INFO,MSGTR_NoSound); |
13684 | 2179 mp_msg(MSGT_CPLAYER,MSGL_V,"Freeing %d unused audio chunks.\n",d_audio->packs); |
1 | 2180 ds_free_packs(d_audio); // free buffered chunks |
2181 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
|
2182 //uninit_player(INITED_AO); // close device |
1 | 2183 } |
5151 | 2184 if(!sh_video){ |
6930 | 2185 mp_msg(MSGT_CPLAYER,MSGL_INFO,MSGTR_Video_NoVideo); |
13684 | 2186 mp_msg(MSGT_CPLAYER,MSGL_V,"Freeing %d unused video chunks.\n",d_video->packs); |
4587
886bf5274992
Audio only support. Include a fix in the asf demuxer opening.
albeu
parents:
4552
diff
changeset
|
2187 ds_free_packs(d_video); |
886bf5274992
Audio only support. Include a fix in the asf demuxer opening.
albeu
parents:
4552
diff
changeset
|
2188 d_video->id=-2; |
7677
33562a65e9e8
_EXPERIMENTAL_ option: -fixed-vo for libvo spec compliance testing
arpi
parents:
7628
diff
changeset
|
2189 //if(!fixed_vo) uninit_player(INITED_VO); |
5151 | 2190 } |
1 | 2191 |
6185
7e769ea2acc7
jump to next file (or exit) if can't decode audio && video
alex
parents:
6183
diff
changeset
|
2192 if (!sh_video && !sh_audio) |
7e769ea2acc7
jump to next file (or exit) if can't decode audio && video
alex
parents:
6183
diff
changeset
|
2193 goto goto_next_file; |
7e769ea2acc7
jump to next file (or exit) if can't decode audio && video
alex
parents:
6183
diff
changeset
|
2194 |
8030
2b39ff3860b7
cleanup of .AVI timestamp calculation (ugly hack from mplayer.c removed,
arpi
parents:
8027
diff
changeset
|
2195 //if(demuxer->file_format!=DEMUXER_TYPE_AVI) pts_from_bps=0; // it must be 0 for mpeg/asf! |
7923 | 2196 if(force_fps && sh_video){ |
4598 | 2197 vo_fps = sh_video->fps=force_fps; |
398 | 2198 sh_video->frametime=1.0f/sh_video->fps; |
1973
5216f108cb4f
all error/warn/info messages moved to help_mp-en.h for translation
arpi
parents:
1962
diff
changeset
|
2199 mp_msg(MSGT_CPLAYER,MSGL_INFO,MSGTR_FPSforced,sh_video->fps,sh_video->frametime); |
398 | 2200 } |
1 | 2201 |
1639 | 2202 //==================== START PLAYING ======================= |
2203 | |
9105
9b387eae87e6
Secondly, fixed bug where -loop after file would play one too many times.
arpi
parents:
9090
diff
changeset
|
2204 if(loop_times>1) loop_times--; else |
9b387eae87e6
Secondly, fixed bug where -loop after file would play one too many times.
arpi
parents:
9090
diff
changeset
|
2205 if(loop_times==1) loop_times = -1; |
9b387eae87e6
Secondly, fixed bug where -loop after file would play one too many times.
arpi
parents:
9090
diff
changeset
|
2206 |
1582 | 2207 mp_msg(MSGT_CPLAYER,MSGL_INFO,MSGTR_StartPlaying);fflush(stdout); |
1 | 2208 |
2209 InitTimer(); | |
2210 | |
5489
5e6e08ff47d5
dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents:
5488
diff
changeset
|
2211 #ifdef USE_DVDNAV |
9752 | 2212 if (stream->type==STREAMTYPE_DVDNAV) { |
5489
5e6e08ff47d5
dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents:
5488
diff
changeset
|
2213 dvdnav_stream_fullstart((dvdnav_priv_t *)stream->priv); |
5e6e08ff47d5
dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents:
5488
diff
changeset
|
2214 } |
5e6e08ff47d5
dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents:
5488
diff
changeset
|
2215 #endif |
5e6e08ff47d5
dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents:
5488
diff
changeset
|
2216 |
1124
0e95f30ffd4c
-frames and -benchmark options to make chl & gabucino happy
arpi_esp
parents:
1059
diff
changeset
|
2217 total_time_usage_start=GetTimer(); |
3934
e8e7ca8995a1
codecs.conf parser hangup fixed by iive, cpu usage reset at start
arpi
parents:
3843
diff
changeset
|
2218 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
|
2219 total_frame_cnt=0; drop_frame_cnt=0; // fix for multifile fps benchmark |
6590 | 2220 play_n_frames=play_n_frames_mf; |
2221 | |
2222 if(play_n_frames==0){ | |
2223 eof=PT_NEXT_ENTRY; goto goto_next_file; | |
2224 } | |
2225 | |
1 | 2226 while(!eof){ |
1439 | 2227 float aq_sleep_time=0; |
1 | 2228 |
1125 | 2229 if(play_n_frames>=0){ |
2230 --play_n_frames; | |
6954
8e991cd2e727
10l bug, noticed by Alexander Neundorf <neundorf@dellingsoft.de>
arpi
parents:
6940
diff
changeset
|
2231 if(play_n_frames<0) eof = PT_NEXT_ENTRY; |
1125 | 2232 } |
2233 | |
1 | 2234 /*========================== PLAY AUDIO ============================*/ |
5610 | 2235 |
1369
7a2f1881b776
a_frame, v_frame killed, using sh_audio/video->timer. has_audio not more used after initialization.
arpi
parents:
1353
diff
changeset
|
2236 while(sh_audio){ |
746 | 2237 unsigned int t; |
4834 | 2238 double tt; |
2705 | 2239 int playsize; |
5610 | 2240 |
2241 current_module="play_audio"; | |
2705 | 2242 |
8056
324b6e5387be
A-V sync cleanup: sh_audio->timer replaced by sh_audio->delay, it contains
arpi
parents:
8030
diff
changeset
|
2243 ao_data.pts=((sh_video?sh_video->timer:0)+sh_audio->delay)*90000.0; |
2705 | 2244 playsize=audio_out->get_space(); |
746 | 2245 |
5610 | 2246 // handle audio-only case: |
13893 | 2247 if(playsize < ao_data.outburst && |
2248 !sh_video) { // buffer is full, do not block here!!! | |
4825
41d2da3bd082
Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents:
4818
diff
changeset
|
2249 usec_sleep(10000); // Wait a tick before retry |
41d2da3bd082
Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents:
4818
diff
changeset
|
2250 continue; |
41d2da3bd082
Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents:
4818
diff
changeset
|
2251 } |
746 | 2252 |
2253 if(playsize>MAX_OUTBURST) playsize=MAX_OUTBURST; // we shouldn't exceed it! | |
5610 | 2254 |
2255 // Fill buffer if needed: | |
1639 | 2256 current_module="decode_audio"; // Enter AUDIO decoder module |
746 | 2257 t=GetTimer(); |
7604
32efb806436e
aufio filter layer (libaf) integration to libmpcodecs, mplayer and mencoder
arpi
parents:
7582
diff
changeset
|
2258 while(sh_audio->a_out_buffer_len<playsize && !d_audio->eof){ |
32efb806436e
aufio filter layer (libaf) integration to libmpcodecs, mplayer and mencoder
arpi
parents:
7582
diff
changeset
|
2259 int ret=decode_audio(sh_audio,&sh_audio->a_out_buffer[sh_audio->a_out_buffer_len], |
32efb806436e
aufio filter layer (libaf) integration to libmpcodecs, mplayer and mencoder
arpi
parents:
7582
diff
changeset
|
2260 playsize-sh_audio->a_out_buffer_len,sh_audio->a_out_buffer_size-sh_audio->a_out_buffer_len); |
5610 | 2261 if(ret<=0) break; // EOF? |
7604
32efb806436e
aufio filter layer (libaf) integration to libmpcodecs, mplayer and mencoder
arpi
parents:
7582
diff
changeset
|
2262 sh_audio->a_out_buffer_len+=ret; |
1 | 2263 } |
4834 | 2264 t=GetTimer()-t; |
5610 | 2265 tt = t*0.000001f; audio_time_usage+=tt; |
7604
32efb806436e
aufio filter layer (libaf) integration to libmpcodecs, mplayer and mencoder
arpi
parents:
7582
diff
changeset
|
2266 if(playsize>sh_audio->a_out_buffer_len) playsize=sh_audio->a_out_buffer_len; |
5610 | 2267 |
2268 // play audio: | |
2269 current_module="play_audio"; | |
7604
32efb806436e
aufio filter layer (libaf) integration to libmpcodecs, mplayer and mencoder
arpi
parents:
7582
diff
changeset
|
2270 playsize=audio_out->play(sh_audio->a_out_buffer,playsize,0); |
1 | 2271 |
955 | 2272 if(playsize>0){ |
7604
32efb806436e
aufio filter layer (libaf) integration to libmpcodecs, mplayer and mencoder
arpi
parents:
7582
diff
changeset
|
2273 sh_audio->a_out_buffer_len-=playsize; |
32efb806436e
aufio filter layer (libaf) integration to libmpcodecs, mplayer and mencoder
arpi
parents:
7582
diff
changeset
|
2274 memmove(sh_audio->a_out_buffer,&sh_audio->a_out_buffer[playsize],sh_audio->a_out_buffer_len); |
8056
324b6e5387be
A-V sync cleanup: sh_audio->timer replaced by sh_audio->delay, it contains
arpi
parents:
8030
diff
changeset
|
2275 sh_audio->delay+=playback_speed*playsize/((float)((ao_data.bps && sh_audio->afilter) ? |
7604
32efb806436e
aufio filter layer (libaf) integration to libmpcodecs, mplayer and mencoder
arpi
parents:
7582
diff
changeset
|
2276 ao_data.bps : sh_audio->o_bps)); |
1 | 2277 } |
2278 | |
2279 break; | |
5610 | 2280 } // while(sh_audio) |
1 | 2281 |
4587
886bf5274992
Audio only support. Include a fix in the asf demuxer opening.
albeu
parents:
4552
diff
changeset
|
2282 if(!sh_video) { |
5610 | 2283 // handle audio-only case: |
10223 | 2284 if(!quiet) { |
13857
38424a8eb0ea
reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents:
13794
diff
changeset
|
2285 float a_pos = sh_audio->delay - audio_out->get_delay() * playback_speed; |
38424a8eb0ea
reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents:
13794
diff
changeset
|
2286 print_status(a_pos, 0, 0); |
10223 | 2287 } |
5610 | 2288 if(d_audio->eof) eof = PT_NEXT_ENTRY; |
2289 | |
2290 } else { | |
4587
886bf5274992
Audio only support. Include a fix in the asf demuxer opening.
albeu
parents:
4552
diff
changeset
|
2291 |
1 | 2292 /*========================== PLAY VIDEO ============================*/ |
2293 | |
5929
9e7d54e7be58
- frame_time delayed one frame, as it's really duration of current frame,
arpi
parents:
5927
diff
changeset
|
2294 float frame_time=next_frame_time; |
9e7d54e7be58
- frame_time delayed one frame, as it's really duration of current frame,
arpi
parents:
5927
diff
changeset
|
2295 |
9e7d54e7be58
- frame_time delayed one frame, as it's really duration of current frame,
arpi
parents:
5927
diff
changeset
|
2296 vo_pts=sh_video->timer*90000.0; |
9e7d54e7be58
- frame_time delayed one frame, as it's really duration of current frame,
arpi
parents:
5927
diff
changeset
|
2297 vo_fps=sh_video->fps; |
9e7d54e7be58
- frame_time delayed one frame, as it's really duration of current frame,
arpi
parents:
5927
diff
changeset
|
2298 |
9e7d54e7be58
- frame_time delayed one frame, as it's really duration of current frame,
arpi
parents:
5927
diff
changeset
|
2299 if(!frame_time_remaining){ |
2567 | 2300 //-------------------- Decode a frame: ----------------------- |
2301 vdecode_time=video_time_usage; | |
5698
cb47abf3b511
Fix loop playback. Main loop was quited on end of video.
albeu
parents:
5681
diff
changeset
|
2302 while(1) |
2567 | 2303 { unsigned char* start=NULL; |
2304 int in_size; | |
2305 // get it! | |
2306 current_module="video_read_frame"; | |
5929
9e7d54e7be58
- frame_time delayed one frame, as it's really duration of current frame,
arpi
parents:
5927
diff
changeset
|
2307 in_size=video_read_frame(sh_video,&next_frame_time,&start,force_fps); |
2567 | 2308 if(in_size<0){ eof=1; break; } |
2309 if(in_size>max_framesize) max_framesize=in_size; // stats | |
5612
027568c0f982
new -framedrop code - works much better than the old one
arpi
parents:
5610
diff
changeset
|
2310 sh_video->timer+=frame_time; |
8056
324b6e5387be
A-V sync cleanup: sh_audio->timer replaced by sh_audio->delay, it contains
arpi
parents:
8030
diff
changeset
|
2311 if(sh_audio) sh_audio->delay-=frame_time; |
5612
027568c0f982
new -framedrop code - works much better than the old one
arpi
parents:
5610
diff
changeset
|
2312 time_frame+=frame_time; // for nosound |
027568c0f982
new -framedrop code - works much better than the old one
arpi
parents:
5610
diff
changeset
|
2313 // check for frame-drop: |
5643 | 2314 current_module="check_framedrop"; |
5612
027568c0f982
new -framedrop code - works much better than the old one
arpi
parents:
5610
diff
changeset
|
2315 if(sh_audio && !d_audio->eof){ |
7605
c3bbe602aff3
new option -speed, to set playback speed rate (examples: -speed 1:3 or -speed 5)
arpi
parents:
7604
diff
changeset
|
2316 float delay=playback_speed*audio_out->get_delay(); |
8056
324b6e5387be
A-V sync cleanup: sh_audio->timer replaced by sh_audio->delay, it contains
arpi
parents:
8030
diff
changeset
|
2317 float d=delay-sh_audio->delay; |
5612
027568c0f982
new -framedrop code - works much better than the old one
arpi
parents:
5610
diff
changeset
|
2318 // we should avoid dropping to many frames in sequence unless we |
027568c0f982
new -framedrop code - works much better than the old one
arpi
parents:
5610
diff
changeset
|
2319 // are too late. and we allow 100ms A-V delay here: |
12981
a0654c0e4202
Don't drop frames when paused, fixes not displaying the pause OSD icon
diego
parents:
12954
diff
changeset
|
2320 if(d<-dropped_frames*frame_time-0.100 && osd_function != OSD_PAUSE){ |
5612
027568c0f982
new -framedrop code - works much better than the old one
arpi
parents:
5610
diff
changeset
|
2321 drop_frame=frame_dropping; |
027568c0f982
new -framedrop code - works much better than the old one
arpi
parents:
5610
diff
changeset
|
2322 ++drop_frame_cnt; |
027568c0f982
new -framedrop code - works much better than the old one
arpi
parents:
5610
diff
changeset
|
2323 ++dropped_frames; |
027568c0f982
new -framedrop code - works much better than the old one
arpi
parents:
5610
diff
changeset
|
2324 } else { |
027568c0f982
new -framedrop code - works much better than the old one
arpi
parents:
5610
diff
changeset
|
2325 drop_frame=dropped_frames=0; |
027568c0f982
new -framedrop code - works much better than the old one
arpi
parents:
5610
diff
changeset
|
2326 } |
5621 | 2327 ++total_frame_cnt; |
5612
027568c0f982
new -framedrop code - works much better than the old one
arpi
parents:
5610
diff
changeset
|
2328 } |
2567 | 2329 // decode: |
2330 current_module="decode_video"; | |
2331 // printf("Decode! %p %d \n",start,in_size); | |
5507
d0d029fda134
video filter layer - written from scratch, but inspired a lot by Fredrik Kuivinen's patch
arpi
parents:
5489
diff
changeset
|
2332 blit_frame=decode_video(sh_video,start,in_size,drop_frame); |
5698
cb47abf3b511
Fix loop playback. Main loop was quited on end of video.
albeu
parents:
5681
diff
changeset
|
2333 break; |
1291 | 2334 } |
2567 | 2335 vdecode_time=video_time_usage-vdecode_time; |
2336 //------------------------ frame decoded. -------------------- | |
5610 | 2337 |
2338 mp_dbg(MSGT_AVSYNC,MSGL_DBG2,"*** ftime=%5.3f ***\n",frame_time); | |
2339 | |
5927 | 2340 if(sh_video->vf_inited<0){ |
6930 | 2341 mp_msg(MSGT_CPLAYER,MSGL_FATAL,MSGTR_NotInitializeVOPorVO); |
5927 | 2342 eof=1; goto goto_next_file; |
2343 } | |
2344 | |
5929
9e7d54e7be58
- frame_time delayed one frame, as it's really duration of current frame,
arpi
parents:
5927
diff
changeset
|
2345 } |
9e7d54e7be58
- frame_time delayed one frame, as it's really duration of current frame,
arpi
parents:
5927
diff
changeset
|
2346 |
5610 | 2347 // ========================================================================== |
2567 | 2348 |
5643 | 2349 // current_module="draw_osd"; |
2350 // if(vo_config_count) video_out->draw_osd(); | |
1 | 2351 |
5610 | 2352 #ifdef HAVE_NEW_GUI |
2353 if(use_gui) guiEventHandling(); | |
2354 #endif | |
2355 | |
2356 current_module="calc_sleep_time"; | |
780 | 2357 |
5612
027568c0f982
new -framedrop code - works much better than the old one
arpi
parents:
5610
diff
changeset
|
2358 #if 0 |
027568c0f982
new -framedrop code - works much better than the old one
arpi
parents:
5610
diff
changeset
|
2359 { // debug frame dropping code |
3097 | 2360 float delay=audio_out->get_delay(); |
5612
027568c0f982
new -framedrop code - works much better than the old one
arpi
parents:
5610
diff
changeset
|
2361 mp_msg(MSGT_AVSYNC,MSGL_V,"\r[V] %5.3f [A] %5.3f => {%5.3f} (%5.3f) [%d] \n", |
027568c0f982
new -framedrop code - works much better than the old one
arpi
parents:
5610
diff
changeset
|
2362 sh_video->timer,sh_audio->timer-delay, |
027568c0f982
new -framedrop code - works much better than the old one
arpi
parents:
5610
diff
changeset
|
2363 sh_video->timer-(sh_audio->timer-delay), |
027568c0f982
new -framedrop code - works much better than the old one
arpi
parents:
5610
diff
changeset
|
2364 delay,drop_frame); |
027568c0f982
new -framedrop code - works much better than the old one
arpi
parents:
5610
diff
changeset
|
2365 } |
027568c0f982
new -framedrop code - works much better than the old one
arpi
parents:
5610
diff
changeset
|
2366 #endif |
027568c0f982
new -framedrop code - works much better than the old one
arpi
parents:
5610
diff
changeset
|
2367 |
7576
c135f7646036
new opt: -autosync, controls ao->get_delay() smoothing (default: disabled)
arpi
parents:
7563
diff
changeset
|
2368 if(drop_frame && !frame_time_remaining && !autosync){ |
c135f7646036
new opt: -autosync, controls ao->get_delay() smoothing (default: disabled)
arpi
parents:
7563
diff
changeset
|
2369 /* |
c135f7646036
new opt: -autosync, controls ao->get_delay() smoothing (default: disabled)
arpi
parents:
7563
diff
changeset
|
2370 * Note: time_frame should not be forced to 0 in autosync mode. |
c135f7646036
new opt: -autosync, controls ao->get_delay() smoothing (default: disabled)
arpi
parents:
7563
diff
changeset
|
2371 * It is used as a cumulative counter to predict and correct the |
c135f7646036
new opt: -autosync, controls ao->get_delay() smoothing (default: disabled)
arpi
parents:
7563
diff
changeset
|
2372 * delay measurements from the audio driver. time_frame is already |
c135f7646036
new opt: -autosync, controls ao->get_delay() smoothing (default: disabled)
arpi
parents:
7563
diff
changeset
|
2373 * < 0, so the "time to sleep" code does not actually sleep. Also, |
c135f7646036
new opt: -autosync, controls ao->get_delay() smoothing (default: disabled)
arpi
parents:
7563
diff
changeset
|
2374 * blit_frame is already 0 because drop_frame was true when |
c135f7646036
new opt: -autosync, controls ao->get_delay() smoothing (default: disabled)
arpi
parents:
7563
diff
changeset
|
2375 * decode_video was called (which causes it to set blit_frame to 0.) |
c135f7646036
new opt: -autosync, controls ao->get_delay() smoothing (default: disabled)
arpi
parents:
7563
diff
changeset
|
2376 * When autosync==0, the default behavior is still completely unchanged. |
c135f7646036
new opt: -autosync, controls ao->get_delay() smoothing (default: disabled)
arpi
parents:
7563
diff
changeset
|
2377 */ |
5610 | 2378 |
2379 time_frame=0; // don't sleep! | |
2380 blit_frame=0; // don't display! | |
2381 | |
798 | 2382 } else { |
5612
027568c0f982
new -framedrop code - works much better than the old one
arpi
parents:
5610
diff
changeset
|
2383 |
780 | 2384 // It's time to sleep... |
5612
027568c0f982
new -framedrop code - works much better than the old one
arpi
parents:
5610
diff
changeset
|
2385 |
5929
9e7d54e7be58
- frame_time delayed one frame, as it's really duration of current frame,
arpi
parents:
5927
diff
changeset
|
2386 frame_time_remaining=0; |
780 | 2387 time_frame-=GetRelativeTime(); // reset timer |
2388 | |
1369
7a2f1881b776
a_frame, v_frame killed, using sh_audio/video->timer. has_audio not more used after initialization.
arpi
parents:
1353
diff
changeset
|
2389 if(sh_audio && !d_audio->eof){ |
7605
c3bbe602aff3
new option -speed, to set playback speed rate (examples: -speed 1:3 or -speed 5)
arpi
parents:
7604
diff
changeset
|
2390 float delay=playback_speed*audio_out->get_delay(); |
3097 | 2391 mp_dbg(MSGT_AVSYNC,MSGL_DBG2,"delay=%f\n",delay); |
2889
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
2392 |
7576
c135f7646036
new opt: -autosync, controls ao->get_delay() smoothing (default: disabled)
arpi
parents:
7563
diff
changeset
|
2393 if (autosync){ |
c135f7646036
new opt: -autosync, controls ao->get_delay() smoothing (default: disabled)
arpi
parents:
7563
diff
changeset
|
2394 /* |
c135f7646036
new opt: -autosync, controls ao->get_delay() smoothing (default: disabled)
arpi
parents:
7563
diff
changeset
|
2395 * Adjust this raw delay value by calculating the expected |
c135f7646036
new opt: -autosync, controls ao->get_delay() smoothing (default: disabled)
arpi
parents:
7563
diff
changeset
|
2396 * delay for this frame and generating a new value which is |
c135f7646036
new opt: -autosync, controls ao->get_delay() smoothing (default: disabled)
arpi
parents:
7563
diff
changeset
|
2397 * weighted between the two. The higher autosync is, the |
c135f7646036
new opt: -autosync, controls ao->get_delay() smoothing (default: disabled)
arpi
parents:
7563
diff
changeset
|
2398 * closer to the delay value gets to that which "-nosound" |
c135f7646036
new opt: -autosync, controls ao->get_delay() smoothing (default: disabled)
arpi
parents:
7563
diff
changeset
|
2399 * would have used, and the longer it will take for A/V |
c135f7646036
new opt: -autosync, controls ao->get_delay() smoothing (default: disabled)
arpi
parents:
7563
diff
changeset
|
2400 * sync to settle at the right value (but it eventually will.) |
c135f7646036
new opt: -autosync, controls ao->get_delay() smoothing (default: disabled)
arpi
parents:
7563
diff
changeset
|
2401 * This settling time is very short for values below 100. |
c135f7646036
new opt: -autosync, controls ao->get_delay() smoothing (default: disabled)
arpi
parents:
7563
diff
changeset
|
2402 */ |
8056
324b6e5387be
A-V sync cleanup: sh_audio->timer replaced by sh_audio->delay, it contains
arpi
parents:
8030
diff
changeset
|
2403 float predicted = sh_audio->delay+time_frame; |
7576
c135f7646036
new opt: -autosync, controls ao->get_delay() smoothing (default: disabled)
arpi
parents:
7563
diff
changeset
|
2404 float difference = delay - predicted; |
c135f7646036
new opt: -autosync, controls ao->get_delay() smoothing (default: disabled)
arpi
parents:
7563
diff
changeset
|
2405 delay = predicted + difference / (float)autosync; |
c135f7646036
new opt: -autosync, controls ao->get_delay() smoothing (default: disabled)
arpi
parents:
7563
diff
changeset
|
2406 } |
c135f7646036
new opt: -autosync, controls ao->get_delay() smoothing (default: disabled)
arpi
parents:
7563
diff
changeset
|
2407 |
8056
324b6e5387be
A-V sync cleanup: sh_audio->timer replaced by sh_audio->delay, it contains
arpi
parents:
8030
diff
changeset
|
2408 time_frame=delay-sh_audio->delay; |
3097 | 2409 |
7495 | 2410 // delay = amount of audio buffered in soundcard/driver |
5929
9e7d54e7be58
- frame_time delayed one frame, as it's really duration of current frame,
arpi
parents:
5927
diff
changeset
|
2411 if(delay>0.25) delay=0.25; else |
9e7d54e7be58
- frame_time delayed one frame, as it's really duration of current frame,
arpi
parents:
5927
diff
changeset
|
2412 if(delay<0.10) delay=0.10; |
9e7d54e7be58
- frame_time delayed one frame, as it's really duration of current frame,
arpi
parents:
5927
diff
changeset
|
2413 if(time_frame>delay*0.6){ |
9e7d54e7be58
- frame_time delayed one frame, as it's really duration of current frame,
arpi
parents:
5927
diff
changeset
|
2414 // sleep time too big - may cause audio drops (buffer underrun) |
9e7d54e7be58
- frame_time delayed one frame, as it's really duration of current frame,
arpi
parents:
5927
diff
changeset
|
2415 frame_time_remaining=1; |
9e7d54e7be58
- frame_time delayed one frame, as it's really duration of current frame,
arpi
parents:
5927
diff
changeset
|
2416 time_frame=delay*0.5; |
9e7d54e7be58
- frame_time delayed one frame, as it's really duration of current frame,
arpi
parents:
5927
diff
changeset
|
2417 } |
9e7d54e7be58
- frame_time delayed one frame, as it's really duration of current frame,
arpi
parents:
5927
diff
changeset
|
2418 |
780 | 2419 } else { |
5610 | 2420 |
2889
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
2421 // NOSOUND: |
1124
0e95f30ffd4c
-frames and -benchmark options to make chl & gabucino happy
arpi_esp
parents:
1059
diff
changeset
|
2422 if( (time_frame<-3*frame_time || time_frame>3*frame_time) || benchmark) |
0e95f30ffd4c
-frames and -benchmark options to make chl & gabucino happy
arpi_esp
parents:
1059
diff
changeset
|
2423 time_frame=0; |
0e95f30ffd4c
-frames and -benchmark options to make chl & gabucino happy
arpi_esp
parents:
1059
diff
changeset
|
2424 |
780 | 2425 } |
798 | 2426 |
1369
7a2f1881b776
a_frame, v_frame killed, using sh_audio/video->timer. has_audio not more used after initialization.
arpi
parents:
1353
diff
changeset
|
2427 // if(verbose>1)printf("sleep: %5.3f a:%6.3f v:%6.3f \n",time_frame,sh_audio->timer,sh_video->timer); |
1439 | 2428 |
2429 aq_sleep_time+=time_frame; | |
1709 | 2430 |
5610 | 2431 } // !drop_frame |
2432 | |
2433 //============================== SLEEP: =================================== | |
2434 | |
8068 | 2435 time_frame/=playback_speed; |
2436 | |
5610 | 2437 // flag 256 means: libvo driver does its timing (dvb card) |
2438 if(time_frame>0.001 && !(vo_flags&256)){ | |
2889
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
2439 |
3015 | 2440 #ifdef HAVE_RTC |
2889
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
2441 if(rtc_fd>=0){ |
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
2442 // -------- RTC ----------- |
5610 | 2443 current_module="sleep_rtc"; |
2889
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
2444 while (time_frame > 0.000) { |
7494 | 2445 unsigned long rtc_ts; |
2889
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
2446 if (read (rtc_fd, &rtc_ts, sizeof(rtc_ts)) <= 0) |
13577 | 2447 mp_msg(MSGT_CPLAYER, MSGL_ERR, MSGTR_LinuxRTCReadError, strerror(errno)); |
2889
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
2448 time_frame-=GetRelativeTime(); |
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
2449 } |
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
2450 } else |
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
2451 #endif |
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
2452 { |
12954 | 2453 // -------- TIMER + SOFTSLEEP ----------- |
2889
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
2454 float min=softsleep?0.021:0.005; |
12954 | 2455 current_module="sleep_timer"; |
2889
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
2456 while(time_frame>min){ |
746 | 2457 if(time_frame<=0.020) |
1439 | 2458 usec_sleep(0); // sleeps 1 clock tick (10ms)! |
746 | 2459 else |
2757 | 2460 usec_sleep(1000000*(time_frame-0.020)); |
746 | 2461 time_frame-=GetRelativeTime(); |
2889
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
2462 } |
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
2463 if(softsleep){ |
5610 | 2464 current_module="sleep_soft"; |
13577 | 2465 if(time_frame<0) mp_msg(MSGT_AVSYNC, MSGL_WARN, MSGTR_SoftsleepUnderflow); |
2889
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
2466 while(time_frame>0) time_frame-=GetRelativeTime(); // burn the CPU |
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
2467 } |
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
2468 } |
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
2469 |
2705 | 2470 } |
117 | 2471 |
5929
9e7d54e7be58
- frame_time delayed one frame, as it's really duration of current frame,
arpi
parents:
5927
diff
changeset
|
2472 //if(!frame_time_remaining){ // should we display the frame now? |
9e7d54e7be58
- frame_time delayed one frame, as it's really duration of current frame,
arpi
parents:
5927
diff
changeset
|
2473 |
5610 | 2474 //====================== FLIP PAGE (VIDEO BLT): ========================= |
2475 | |
6123 | 2476 current_module="vo_check_events"; |
2477 if(vo_config_count) video_out->check_events(); | |
2478 | |
715 | 2479 current_module="flip_page"; |
8450 | 2480 if (!frame_time_remaining) { |
2481 if(blit_frame){ | |
1962 | 2482 unsigned int t2=GetTimer(); |
4838 | 2483 double tt; |
2889
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
2484 float j; |
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
2485 #define FRAME_LAG_WARN 0.2 |
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
2486 j = ((float)t2 - lastframeout_ts) / 1000000; |
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
2487 lastframeout_ts = GetTimer(); |
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
2488 if (j < frame_time + frame_time * -FRAME_LAG_WARN) |
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
2489 too_fast_frame_cnt++; |
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
2490 /* printf ("PANIC: too fast frame (%.3f)!\n", j); */ |
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
2491 else if (j > frame_time + frame_time * FRAME_LAG_WARN) |
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
2492 too_slow_frame_cnt++; |
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
2493 /* printf ("PANIC: too slow frame (%.3f)!\n", j); */ |
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
2494 |
5511 | 2495 if(vo_config_count) video_out->flip_page(); |
5610 | 2496 // usec_sleep(50000); // test only! |
4838 | 2497 t2=GetTimer()-t2; |
2498 tt = t2*0.000001f; | |
2499 vout_time_usage+=tt; | |
8450 | 2500 } else { |
2501 /* | |
2502 Well, no blitting is needed, but some devices (such as yuv4mpeg) must output frame | |
2503 otherwise A/V desync will occur. -- Alvieboy | |
2504 */ | |
2505 if (vo_config_count) | |
2506 video_out->control(VOCTRL_DUPLICATE_FRAME, NULL); | |
2507 } | |
2508 } | |
5610 | 2509 //====================== A-V TIMESTAMP CORRECTION: ========================= |
2510 | |
2511 current_module="av_sync"; | |
2512 | |
1369
7a2f1881b776
a_frame, v_frame killed, using sh_audio/video->timer. has_audio not more used after initialization.
arpi
parents:
1353
diff
changeset
|
2513 if(sh_audio){ |
780 | 2514 float a_pts=0; |
2515 float v_pts=0; | |
2516 | |
746 | 2517 // unplayed bytes in our and soundcard/dma buffer: |
7605
c3bbe602aff3
new option -speed, to set playback speed rate (examples: -speed 1:3 or -speed 5)
arpi
parents:
7604
diff
changeset
|
2518 float delay=playback_speed*audio_out->get_delay()+(float)sh_audio->a_buffer_len/(float)sh_audio->o_bps; |
746 | 2519 |
7576
c135f7646036
new opt: -autosync, controls ao->get_delay() smoothing (default: disabled)
arpi
parents:
7563
diff
changeset
|
2520 if (autosync){ |
c135f7646036
new opt: -autosync, controls ao->get_delay() smoothing (default: disabled)
arpi
parents:
7563
diff
changeset
|
2521 /* |
c135f7646036
new opt: -autosync, controls ao->get_delay() smoothing (default: disabled)
arpi
parents:
7563
diff
changeset
|
2522 * If autosync is enabled, the value for delay must be calculated |
c135f7646036
new opt: -autosync, controls ao->get_delay() smoothing (default: disabled)
arpi
parents:
7563
diff
changeset
|
2523 * a bit differently. It is set only to the difference between |
c135f7646036
new opt: -autosync, controls ao->get_delay() smoothing (default: disabled)
arpi
parents:
7563
diff
changeset
|
2524 * the audio and video timers. Any attempt to include the real |
c135f7646036
new opt: -autosync, controls ao->get_delay() smoothing (default: disabled)
arpi
parents:
7563
diff
changeset
|
2525 * or corrected delay causes the pts_correction code below to |
c135f7646036
new opt: -autosync, controls ao->get_delay() smoothing (default: disabled)
arpi
parents:
7563
diff
changeset
|
2526 * try to correct for the changes in delay which autosync is |
c135f7646036
new opt: -autosync, controls ao->get_delay() smoothing (default: disabled)
arpi
parents:
7563
diff
changeset
|
2527 * trying to measure. This keeps the two from competing, but still |
c135f7646036
new opt: -autosync, controls ao->get_delay() smoothing (default: disabled)
arpi
parents:
7563
diff
changeset
|
2528 * allows the code to correct for PTS drift *only*. (Using a delay |
c135f7646036
new opt: -autosync, controls ao->get_delay() smoothing (default: disabled)
arpi
parents:
7563
diff
changeset
|
2529 * value here, even a "corrected" one, would be incompatible with |
c135f7646036
new opt: -autosync, controls ao->get_delay() smoothing (default: disabled)
arpi
parents:
7563
diff
changeset
|
2530 * autosync mode.) |
c135f7646036
new opt: -autosync, controls ao->get_delay() smoothing (default: disabled)
arpi
parents:
7563
diff
changeset
|
2531 */ |
8056
324b6e5387be
A-V sync cleanup: sh_audio->timer replaced by sh_audio->delay, it contains
arpi
parents:
8030
diff
changeset
|
2532 delay=sh_audio->delay; |
7576
c135f7646036
new opt: -autosync, controls ao->get_delay() smoothing (default: disabled)
arpi
parents:
7563
diff
changeset
|
2533 delay+=(float)sh_audio->a_buffer_len/(float)sh_audio->o_bps; |
c135f7646036
new opt: -autosync, controls ao->get_delay() smoothing (default: disabled)
arpi
parents:
7563
diff
changeset
|
2534 } |
c135f7646036
new opt: -autosync, controls ao->get_delay() smoothing (default: disabled)
arpi
parents:
7563
diff
changeset
|
2535 |
8030
2b39ff3860b7
cleanup of .AVI timestamp calculation (ugly hack from mplayer.c removed,
arpi
parents:
8027
diff
changeset
|
2536 #if 0 |
780 | 2537 if(pts_from_bps){ |
5610 | 2538 // PTS = sample_no / samplerate |
7735
197cee6aa59e
always use rounded-up blocksize for .avi files (fixes Firestarter.mpg.avi)
arpi
parents:
7731
diff
changeset
|
2539 unsigned int samples= |
197cee6aa59e
always use rounded-up blocksize for .avi files (fixes Firestarter.mpg.avi)
arpi
parents:
7731
diff
changeset
|
2540 // (sh_audio->audio.dwSampleSize)? |
197cee6aa59e
always use rounded-up blocksize for .avi files (fixes Firestarter.mpg.avi)
arpi
parents:
7731
diff
changeset
|
2541 // ((ds_tell(d_audio)-sh_audio->a_in_buffer_len)/sh_audio->audio.dwSampleSize) : |
7749
48bf03297d48
more accurate a_pts calculation in AVI -bps (default) mode
arpi
parents:
7735
diff
changeset
|
2542 ds_tell_block(d_audio); // <- used for VBR audio |
3302 | 2543 samples+=sh_audio->audio.dwStart; // offset |
1498 | 2544 a_pts=samples*(float)sh_audio->audio.dwScale/(float)sh_audio->audio.dwRate; |
5610 | 2545 delay_corrected=1; |
7749
48bf03297d48
more accurate a_pts calculation in AVI -bps (default) mode
arpi
parents:
7735
diff
changeset
|
2546 a_pts-=(sh_audio->a_in_buffer_len)/(float)sh_audio->i_bps; |
8030
2b39ff3860b7
cleanup of .AVI timestamp calculation (ugly hack from mplayer.c removed,
arpi
parents:
8027
diff
changeset
|
2547 } else |
2b39ff3860b7
cleanup of .AVI timestamp calculation (ugly hack from mplayer.c removed,
arpi
parents:
8027
diff
changeset
|
2548 #endif |
2b39ff3860b7
cleanup of .AVI timestamp calculation (ugly hack from mplayer.c removed,
arpi
parents:
8027
diff
changeset
|
2549 { |
780 | 2550 // PTS = (last timestamp) + (bytes after last timestamp)/(bytes per sec) |
746 | 2551 a_pts=d_audio->pts; |
1498 | 2552 if(!delay_corrected) if(a_pts) delay_corrected=1; |
6429 | 2553 #if 0 |
13577 | 2554 mp_msg(MSGT_FIXME, MSGL_FIXME, "\n#X# pts=%5.3f ds_pts=%5.3f buff=%5.3f total=%5.3f\n", |
6429 | 2555 a_pts, |
2556 ds_tell_pts(d_audio)/(float)sh_audio->i_bps, | |
2557 -sh_audio->a_in_buffer_len/(float)sh_audio->i_bps, | |
2558 a_pts+(ds_tell_pts(d_audio)-sh_audio->a_in_buffer_len)/(float)sh_audio->i_bps); | |
2559 #endif | |
746 | 2560 a_pts+=(ds_tell_pts(d_audio)-sh_audio->a_in_buffer_len)/(float)sh_audio->i_bps; |
780 | 2561 } |
8965 | 2562 v_pts=sh_video ? sh_video->pts : d_video->pts; |
746 | 2563 |
1567 | 2564 mp_dbg(MSGT_AVSYNC,MSGL_DBG2,"### A:%8.3f (%8.3f) V:%8.3f A-V:%7.4f \n",a_pts,a_pts-audio_delay-delay,v_pts,(a_pts-delay-audio_delay)-v_pts); |
780 | 2565 |
398 | 2566 if(delay_corrected){ |
6173 | 2567 static int drop_message=0; |
1478
6f9167f0fcca
'too slow' message is fixed - better detection now based on both drop_cnt and A-V sync
arpi
parents:
1467
diff
changeset
|
2568 float x; |
6f9167f0fcca
'too slow' message is fixed - better detection now based on both drop_cnt and A-V sync
arpi
parents:
1467
diff
changeset
|
2569 AV_delay=(a_pts-delay-audio_delay)-v_pts; |
11254 | 2570 if(AV_delay>0.5 && drop_frame_cnt>50 && drop_message==0){ |
6173 | 2571 ++drop_message; |
10341
eee7cab79089
moved the system too slow message to MSGL_WARN, so gui users will not be annoyed.. (and imho it fits better into that category, warning vs error)
alex
parents:
10272
diff
changeset
|
2572 mp_msg(MSGT_AVSYNC,MSGL_WARN,MSGTR_SystemTooSlow); |
6173 | 2573 } |
1478
6f9167f0fcca
'too slow' message is fixed - better detection now based on both drop_cnt and A-V sync
arpi
parents:
1467
diff
changeset
|
2574 x=AV_delay*0.1f; |
1 | 2575 if(x<-max_pts_correction) x=-max_pts_correction; else |
2576 if(x> max_pts_correction) x= max_pts_correction; | |
780 | 2577 if(default_max_pts_correction>=0) |
2578 max_pts_correction=default_max_pts_correction; | |
2579 else | |
2580 max_pts_correction=sh_video->frametime*0.10; // +-10% of time | |
8056
324b6e5387be
A-V sync cleanup: sh_audio->timer replaced by sh_audio->delay, it contains
arpi
parents:
8030
diff
changeset
|
2581 if(!frame_time_remaining){ sh_audio->delay+=x; c_total+=x;} // correction |
13857
38424a8eb0ea
reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents:
13794
diff
changeset
|
2582 if(!quiet) |
38424a8eb0ea
reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents:
13794
diff
changeset
|
2583 print_status(a_pts - audio_delay - delay, AV_delay, c_total); |
1 | 2584 } |
780 | 2585 |
1 | 2586 } else { |
2587 // No audio: | |
1420 | 2588 |
1448 | 2589 if(!quiet) |
13857
38424a8eb0ea
reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents:
13794
diff
changeset
|
2590 print_status(0, 0, 0); |
1420 | 2591 |
1 | 2592 } |
5610 | 2593 |
2594 //============================ Auto QUALITY ============================ | |
1 | 2595 |
1439 | 2596 /*Output quality adjustments:*/ |
2597 if(auto_quality>0){ | |
5610 | 2598 current_module="autoq"; |
1496 | 2599 // float total=0.000001f * (GetTimer()-aq_total_time); |
1439 | 2600 // if(output_quality<auto_quality && aq_sleep_time>0.05f*total) |
2601 if(output_quality<auto_quality && aq_sleep_time>0) | |
2602 ++output_quality; | |
2603 else | |
2604 // if(output_quality>0 && aq_sleep_time<-0.05f*total) | |
2605 if(output_quality>1 && aq_sleep_time<0) | |
2606 --output_quality; | |
2607 else | |
2608 if(output_quality>0 && aq_sleep_time<-0.050f) // 50ms | |
2609 output_quality=0; | |
2610 // printf("total: %8.6f sleep: %8.6f q: %d\n",(0.000001f*aq_total_time),aq_sleep_time,output_quality); | |
2611 set_video_quality(sh_video,output_quality); | |
2612 } | |
2613 | |
5610 | 2614 } // end if(sh_video) |
2615 | |
2616 //============================ Handle PAUSE =============================== | |
2617 | |
2618 current_module="pause"; | |
4587
886bf5274992
Audio only support. Include a fix in the asf demuxer opening.
albeu
parents:
4552
diff
changeset
|
2619 |
1422 | 2620 #ifdef USE_OSD |
220 | 2621 if(osd_visible){ |
5638
86663f1b9b00
new osd code, use osd objs to follow changes and do minimal updates
arpi
parents:
5627
diff
changeset
|
2622 if (!--osd_visible){ |
86663f1b9b00
new osd code, use osd objs to follow changes and do minimal updates
arpi
parents:
5627
diff
changeset
|
2623 vo_osd_progbar_type=-1; // disable |
86663f1b9b00
new osd code, use osd objs to follow changes and do minimal updates
arpi
parents:
5627
diff
changeset
|
2624 vo_osd_changed(OSDTYPE_PROGBAR); |
1504
f4f686aed404
modified mplayer.c to rewert to PLAY after rewinding after 1 sec
atlka
parents:
1501
diff
changeset
|
2625 if (osd_function != OSD_PAUSE) |
f4f686aed404
modified mplayer.c to rewert to PLAY after rewinding after 1 sec
atlka
parents:
1501
diff
changeset
|
2626 osd_function = OSD_PLAY; |
f4f686aed404
modified mplayer.c to rewert to PLAY after rewinding after 1 sec
atlka
parents:
1501
diff
changeset
|
2627 } |
220 | 2628 } |
1422 | 2629 #endif |
371 | 2630 |
2631 if(osd_function==OSD_PAUSE){ | |
4418
8141d2c399e4
A new configurable input system and joystick support for this system
albeu
parents:
4395
diff
changeset
|
2632 mp_cmd_t* cmd; |
4587
886bf5274992
Audio only support. Include a fix in the asf demuxer opening.
albeu
parents:
4552
diff
changeset
|
2633 if(!quiet) { |
6930 | 2634 mp_msg(MSGT_CPLAYER,MSGL_STATUS,MSGTR_Paused); |
4587
886bf5274992
Audio only support. Include a fix in the asf demuxer opening.
albeu
parents:
4552
diff
changeset
|
2635 fflush(stdout); |
886bf5274992
Audio only support. Include a fix in the asf demuxer opening.
albeu
parents:
4552
diff
changeset
|
2636 } |
1793
ba11d77c587a
gui status maintaining - now pause from console works, and gui display is in sync with osd
arpi
parents:
1792
diff
changeset
|
2637 #ifdef HAVE_NEW_GUI |
4974 | 2638 if(use_gui) guiGetEvent( guiCEvent,(char *)guiSetPause ); |
1793
ba11d77c587a
gui status maintaining - now pause from console works, and gui display is in sync with osd
arpi
parents:
1792
diff
changeset
|
2639 #endif |
5511 | 2640 if (video_out && sh_video && vo_config_count) |
4754 | 2641 video_out->control(VOCTRL_PAUSE, NULL); |
2642 | |
1369
7a2f1881b776
a_frame, v_frame killed, using sh_audio/video->timer. has_audio not more used after initialization.
arpi
parents:
1353
diff
changeset
|
2643 if (audio_out && sh_audio) |
1156 | 2644 audio_out->pause(); // pause audio, keep data if possible |
3322
cdd3f5ac06b2
-slave patch by Kilian A. Foth <foth@informatik.uni-hamburg.de>
arpi
parents:
3302
diff
changeset
|
2645 |
13603 | 2646 while( (cmd = mp_input_get_cmd(20,1,1)) == NULL) { |
5511 | 2647 if(sh_video && video_out && vo_config_count) video_out->check_events(); |
1709 | 2648 #ifdef HAVE_NEW_GUI |
2649 if(use_gui){ | |
4798 | 2650 guiEventHandling(); |
6619
f554e7271587
fix volume handling ( step 2 ) -- add balance support and some code cleanup and fix
pontscho
parents:
6590
diff
changeset
|
2651 guiGetEvent( guiReDraw,NULL ); |
4963 | 2652 if(guiIntfStruct.Playing!=2 || (rel_seek_secs || abs_seek_pos)) break; |
1709 | 2653 } |
2654 #endif | |
8198 | 2655 #ifdef HAVE_MENU |
2656 if(vf_menu) | |
2657 vf_menu_pause_update(vf_menu); | |
2658 #endif | |
9464 | 2659 usec_sleep(20000); |
4418
8141d2c399e4
A new configurable input system and joystick support for this system
albeu
parents:
4395
diff
changeset
|
2660 } |
13768
955ad54a9aab
cmd can be NULL when leaving the paused mode and using the GUI
reimar
parents:
13743
diff
changeset
|
2661 if (cmd && cmd->id == MP_CMD_PAUSE) { |
13603 | 2662 cmd = mp_input_get_cmd(0,1,0); |
5046 | 2663 mp_cmd_free(cmd); |
13603 | 2664 } |
723 | 2665 osd_function=OSD_PLAY; |
1369
7a2f1881b776
a_frame, v_frame killed, using sh_audio/video->timer. has_audio not more used after initialization.
arpi
parents:
1353
diff
changeset
|
2666 if (audio_out && sh_audio) |
1156 | 2667 audio_out->resume(); // resume audio |
5511 | 2668 if (video_out && sh_video && vo_config_count) |
4754 | 2669 video_out->control(VOCTRL_RESUME, NULL); // resume video |
2889
0d8553a47d1a
RTC support, softsleep and optional new timing code by Dap
arpi
parents:
2880
diff
changeset
|
2670 (void)GetRelativeTime(); // keep TF around FT in next cycle |
1793
ba11d77c587a
gui status maintaining - now pause from console works, and gui display is in sync with osd
arpi
parents:
1792
diff
changeset
|
2671 #ifdef HAVE_NEW_GUI |
6183
a4bbda72ce86
fix two small bug and add multimedia keyboard support ( i tested with Acer AirKey V only )
pontscho
parents:
6173
diff
changeset
|
2672 if (use_gui) |
a4bbda72ce86
fix two small bug and add multimedia keyboard support ( i tested with Acer AirKey V only )
pontscho
parents:
6173
diff
changeset
|
2673 { |
a4bbda72ce86
fix two small bug and add multimedia keyboard support ( i tested with Acer AirKey V only )
pontscho
parents:
6173
diff
changeset
|
2674 if ( guiIntfStruct.Playing == guiSetStop ) goto goto_next_file; |
a4bbda72ce86
fix two small bug and add multimedia keyboard support ( i tested with Acer AirKey V only )
pontscho
parents:
6173
diff
changeset
|
2675 guiGetEvent( guiCEvent,(char *)guiSetPlay ); |
a4bbda72ce86
fix two small bug and add multimedia keyboard support ( i tested with Acer AirKey V only )
pontscho
parents:
6173
diff
changeset
|
2676 } |
1793
ba11d77c587a
gui status maintaining - now pause from console works, and gui display is in sync with osd
arpi
parents:
1792
diff
changeset
|
2677 #endif |
371 | 2678 } |
2679 | |
5610 | 2680 // handle -sstep |
2436 | 2681 if(step_sec>0) { |
2682 osd_function=OSD_FFW; | |
2683 rel_seek_secs+=step_sec; | |
2684 } | |
1 | 2685 |
5489
5e6e08ff47d5
dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents:
5488
diff
changeset
|
2686 #ifdef USE_DVDNAV |
5e6e08ff47d5
dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents:
5488
diff
changeset
|
2687 if (stream->type==STREAMTYPE_DVDNAV && dvd_nav_still) |
5e6e08ff47d5
dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents:
5488
diff
changeset
|
2688 dvdnav_stream_sleeping((dvdnav_priv_t*)stream->priv); |
5e6e08ff47d5
dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents:
5488
diff
changeset
|
2689 #endif |
5e6e08ff47d5
dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents:
5488
diff
changeset
|
2690 |
8531
1aa2c9b460af
Merged EDL 0.5 patch - it's something like Quicktime's edit lists.
arpi
parents:
8494
diff
changeset
|
2691 //================= EDL ========================================= |
1aa2c9b460af
Merged EDL 0.5 patch - it's something like Quicktime's edit lists.
arpi
parents:
8494
diff
changeset
|
2692 |
1aa2c9b460af
Merged EDL 0.5 patch - it's something like Quicktime's edit lists.
arpi
parents:
8494
diff
changeset
|
2693 #ifdef USE_EDL |
13168 | 2694 if( next_edl_record ) { // Are we (still?) doing EDL? |
12207 | 2695 if ( !sh_video ) { |
13358
567875b88aab
Hardcoded EDL messages moved to help_mp-en.h, Doxygen comments added, patch
diego
parents:
13353
diff
changeset
|
2696 mp_msg( MSGT_CPLAYER, MSGL_ERR, MSGTR_EdlNOsh_video ); |
14807
664b06b907cb
Some to-be-redundant EDL code moved to edl.c with mencoder's edl in mind. Stack handling improvements, Patch by Oded Shimon
reynaldo
parents:
14718
diff
changeset
|
2697 free_edl(edl_records); |
13868
707a29256fd3
Fix broken seek while on edl and audio only, spoted by Oded Shimon
reynaldo
parents:
13867
diff
changeset
|
2698 next_edl_record = NULL; |
707a29256fd3
Fix broken seek while on edl and audio only, spoted by Oded Shimon
reynaldo
parents:
13867
diff
changeset
|
2699 edl_records = NULL; |
12207 | 2700 } else { |
8966 | 2701 if( sh_video->pts >= next_edl_record->start_sec ) { |
8531
1aa2c9b460af
Merged EDL 0.5 patch - it's something like Quicktime's edit lists.
arpi
parents:
8494
diff
changeset
|
2702 if( next_edl_record->action == EDL_SKIP ) { |
1aa2c9b460af
Merged EDL 0.5 patch - it's something like Quicktime's edit lists.
arpi
parents:
8494
diff
changeset
|
2703 osd_function = OSD_FFW; |
1aa2c9b460af
Merged EDL 0.5 patch - it's something like Quicktime's edit lists.
arpi
parents:
8494
diff
changeset
|
2704 abs_seek_pos = 0; |
1aa2c9b460af
Merged EDL 0.5 patch - it's something like Quicktime's edit lists.
arpi
parents:
8494
diff
changeset
|
2705 rel_seek_secs = next_edl_record->length_sec; |
13773 | 2706 mp_msg(MSGT_CPLAYER, MSGL_DBG4, "EDL_SKIP: start [%f], stop [%f], length [%f]\n", next_edl_record->start_sec, next_edl_record->stop_sec, next_edl_record->length_sec ); |
8531
1aa2c9b460af
Merged EDL 0.5 patch - it's something like Quicktime's edit lists.
arpi
parents:
8494
diff
changeset
|
2707 edl_decision = 1; |
1aa2c9b460af
Merged EDL 0.5 patch - it's something like Quicktime's edit lists.
arpi
parents:
8494
diff
changeset
|
2708 } else if( next_edl_record->action == EDL_MUTE ) { |
13882
8a928d5b42b8
Replaces edl_mute_count with togle making code more understandable, other trivial list suggested changes too, Patch by Oded Shimon
reynaldo
parents:
13868
diff
changeset
|
2709 edl_muted = !edl_muted; |
8a928d5b42b8
Replaces edl_mute_count with togle making code more understandable, other trivial list suggested changes too, Patch by Oded Shimon
reynaldo
parents:
13868
diff
changeset
|
2710 if ((user_muted | edl_muted) != mixer.muted) mixer_mute(&mixer); |
13773 | 2711 mp_msg(MSGT_CPLAYER, MSGL_DBG4, "EDL_MUTE: [%f]\n", next_edl_record->start_sec ); |
8531
1aa2c9b460af
Merged EDL 0.5 patch - it's something like Quicktime's edit lists.
arpi
parents:
8494
diff
changeset
|
2712 } |
13168 | 2713 next_edl_record=next_edl_record->next; |
8531
1aa2c9b460af
Merged EDL 0.5 patch - it's something like Quicktime's edit lists.
arpi
parents:
8494
diff
changeset
|
2714 } |
12207 | 2715 } |
8531
1aa2c9b460af
Merged EDL 0.5 patch - it's something like Quicktime's edit lists.
arpi
parents:
8494
diff
changeset
|
2716 } |
1aa2c9b460af
Merged EDL 0.5 patch - it's something like Quicktime's edit lists.
arpi
parents:
8494
diff
changeset
|
2717 #endif |
1aa2c9b460af
Merged EDL 0.5 patch - it's something like Quicktime's edit lists.
arpi
parents:
8494
diff
changeset
|
2718 |
1 | 2719 //================= Keyboard events, SEEKing ==================== |
2720 | |
5610 | 2721 current_module="key_events"; |
2722 | |
4418
8141d2c399e4
A new configurable input system and joystick support for this system
albeu
parents:
4395
diff
changeset
|
2723 { |
8141d2c399e4
A new configurable input system and joystick support for this system
albeu
parents:
4395
diff
changeset
|
2724 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
|
2725 int brk_cmd = 0; |
13603 | 2726 while( !brk_cmd && (cmd = mp_input_get_cmd(0,0,0)) != NULL) { |
4418
8141d2c399e4
A new configurable input system and joystick support for this system
albeu
parents:
4395
diff
changeset
|
2727 switch(cmd->id) { |
8141d2c399e4
A new configurable input system and joystick support for this system
albeu
parents:
4395
diff
changeset
|
2728 case MP_CMD_SEEK : { |
14718 | 2729 float v; |
2730 int abs; | |
8612
a61d1b326beb
It shows not just the progressbar, but progressbar /and/ percentage
arpi
parents:
8606
diff
changeset
|
2731 osd_show_percentage = 25; |
14718 | 2732 v = cmd->args[0].v.f; |
4418
8141d2c399e4
A new configurable input system and joystick support for this system
albeu
parents:
4395
diff
changeset
|
2733 abs = (cmd->nargs > 1) ? cmd->args[1].v.i : 0; |
7450
9720e88cd0bc
This tiny patch adds "type=2" absolute seconds seek capability.
arpi
parents:
7419
diff
changeset
|
2734 if(abs==2) { /* Absolute seek to a specific timestamp in seconds */ |
9720e88cd0bc
This tiny patch adds "type=2" absolute seconds seek capability.
arpi
parents:
7419
diff
changeset
|
2735 abs_seek_pos = 1; |
9720e88cd0bc
This tiny patch adds "type=2" absolute seconds seek capability.
arpi
parents:
7419
diff
changeset
|
2736 if(sh_video) |
9720e88cd0bc
This tiny patch adds "type=2" absolute seconds seek capability.
arpi
parents:
7419
diff
changeset
|
2737 osd_function= (v > sh_video->timer) ? OSD_FFW : OSD_REW; |
9720e88cd0bc
This tiny patch adds "type=2" absolute seconds seek capability.
arpi
parents:
7419
diff
changeset
|
2738 rel_seek_secs = v; |
9720e88cd0bc
This tiny patch adds "type=2" absolute seconds seek capability.
arpi
parents:
7419
diff
changeset
|
2739 } |
9720e88cd0bc
This tiny patch adds "type=2" absolute seconds seek capability.
arpi
parents:
7419
diff
changeset
|
2740 else if(abs) { /* Absolute seek by percentage */ |
4418
8141d2c399e4
A new configurable input system and joystick support for this system
albeu
parents:
4395
diff
changeset
|
2741 abs_seek_pos = 3; |
5798 | 2742 if(sh_video) |
2743 osd_function= (v > sh_video->timer) ? OSD_FFW : OSD_REW; | |
2744 rel_seek_secs = v/100.0; | |
4418
8141d2c399e4
A new configurable input system and joystick support for this system
albeu
parents:
4395
diff
changeset
|
2745 } |
8141d2c399e4
A new configurable input system and joystick support for this system
albeu
parents:
4395
diff
changeset
|
2746 else { |
8141d2c399e4
A new configurable input system and joystick support for this system
albeu
parents:
4395
diff
changeset
|
2747 rel_seek_secs+= v; |
8141d2c399e4
A new configurable input system and joystick support for this system
albeu
parents:
4395
diff
changeset
|
2748 osd_function= (v > 0) ? OSD_FFW : OSD_REW; |
8141d2c399e4
A new configurable input system and joystick support for this system
albeu
parents:
4395
diff
changeset
|
2749 } |
10409
4c9ca4819bed
Commands are read in a loop, but for some commands we need to break
albeu
parents:
10397
diff
changeset
|
2750 brk_cmd = 1; |
4418
8141d2c399e4
A new configurable input system and joystick support for this system
albeu
parents:
4395
diff
changeset
|
2751 } break; |
8531
1aa2c9b460af
Merged EDL 0.5 patch - it's something like Quicktime's edit lists.
arpi
parents:
8494
diff
changeset
|
2752 #ifdef USE_EDL |
1aa2c9b460af
Merged EDL 0.5 patch - it's something like Quicktime's edit lists.
arpi
parents:
8494
diff
changeset
|
2753 case MP_CMD_EDL_MARK: |
1aa2c9b460af
Merged EDL 0.5 patch - it's something like Quicktime's edit lists.
arpi
parents:
8494
diff
changeset
|
2754 if( edl_fd ) { |
8966 | 2755 float v = sh_video->pts; |
8531
1aa2c9b460af
Merged EDL 0.5 patch - it's something like Quicktime's edit lists.
arpi
parents:
8494
diff
changeset
|
2756 fprintf( edl_fd, "%f %f %d\n", v-2, v, 0 ); |
1aa2c9b460af
Merged EDL 0.5 patch - it's something like Quicktime's edit lists.
arpi
parents:
8494
diff
changeset
|
2757 } |
1aa2c9b460af
Merged EDL 0.5 patch - it's something like Quicktime's edit lists.
arpi
parents:
8494
diff
changeset
|
2758 break; |
1aa2c9b460af
Merged EDL 0.5 patch - it's something like Quicktime's edit lists.
arpi
parents:
8494
diff
changeset
|
2759 #endif |
13339
1c787349d286
slave mode command to switch aspect ratio, patch by Aurelien Jacobs <aurel at gnuage.org>
faust3
parents:
13338
diff
changeset
|
2760 case MP_CMD_SWITCH_RATIO : { |
1c787349d286
slave mode command to switch aspect ratio, patch by Aurelien Jacobs <aurel at gnuage.org>
faust3
parents:
13338
diff
changeset
|
2761 if (cmd->nargs == 0) |
1c787349d286
slave mode command to switch aspect ratio, patch by Aurelien Jacobs <aurel at gnuage.org>
faust3
parents:
13338
diff
changeset
|
2762 movie_aspect = (float) sh_video->disp_w / sh_video->disp_h; |
1c787349d286
slave mode command to switch aspect ratio, patch by Aurelien Jacobs <aurel at gnuage.org>
faust3
parents:
13338
diff
changeset
|
2763 else |
1c787349d286
slave mode command to switch aspect ratio, patch by Aurelien Jacobs <aurel at gnuage.org>
faust3
parents:
13338
diff
changeset
|
2764 movie_aspect = cmd->args[0].v.f; |
1c787349d286
slave mode command to switch aspect ratio, patch by Aurelien Jacobs <aurel at gnuage.org>
faust3
parents:
13338
diff
changeset
|
2765 mpcodecs_config_vo (sh_video, sh_video->disp_w, sh_video->disp_h, 0); |
1c787349d286
slave mode command to switch aspect ratio, patch by Aurelien Jacobs <aurel at gnuage.org>
faust3
parents:
13338
diff
changeset
|
2766 } break; |
4418
8141d2c399e4
A new configurable input system and joystick support for this system
albeu
parents:
4395
diff
changeset
|
2767 case MP_CMD_AUDIO_DELAY : { |
8141d2c399e4
A new configurable input system and joystick support for this system
albeu
parents:
4395
diff
changeset
|
2768 float v = cmd->args[0].v.f; |
8141d2c399e4
A new configurable input system and joystick support for this system
albeu
parents:
4395
diff
changeset
|
2769 audio_delay += v; |
8141d2c399e4
A new configurable input system and joystick support for this system
albeu
parents:
4395
diff
changeset
|
2770 osd_show_av_delay = 9; |
8056
324b6e5387be
A-V sync cleanup: sh_audio->timer replaced by sh_audio->delay, it contains
arpi
parents:
8030
diff
changeset
|
2771 if(sh_audio) sh_audio->delay+= v; |
4418
8141d2c399e4
A new configurable input system and joystick support for this system
albeu
parents:
4395
diff
changeset
|
2772 } break; |
13710 | 2773 case MP_CMD_SPEED_INCR : { |
2774 float v = cmd->args[0].v.f; | |
2775 playback_speed += v; | |
13743
5a999bdc0534
100l for playback speed changing in audio-only case
reimar
parents:
13742
diff
changeset
|
2776 if (sh_video) |
13710 | 2777 osd_show_speed = sh_video->fps; |
2778 build_afilter_chain(sh_audio, &ao_data); | |
2779 } break; | |
2780 case MP_CMD_SPEED_MULT : { | |
2781 float v = cmd->args[0].v.f; | |
2782 playback_speed *= v; | |
13743
5a999bdc0534
100l for playback speed changing in audio-only case
reimar
parents:
13742
diff
changeset
|
2783 if (sh_video) |
13710 | 2784 osd_show_speed = sh_video->fps; |
2785 build_afilter_chain(sh_audio, &ao_data); | |
2786 } break; | |
2787 case MP_CMD_SPEED_SET : { | |
2788 float v = cmd->args[0].v.f; | |
2789 playback_speed = v; | |
13743
5a999bdc0534
100l for playback speed changing in audio-only case
reimar
parents:
13742
diff
changeset
|
2790 if (sh_video) |
13710 | 2791 osd_show_speed = sh_video->fps; |
2792 build_afilter_chain(sh_audio, &ao_data); | |
2793 } break; | |
13626
741649fe31cb
allow to step only one frame forward by pressing s.
reimar
parents:
13603
diff
changeset
|
2794 case MP_CMD_FRAME_STEP : |
4418
8141d2c399e4
A new configurable input system and joystick support for this system
albeu
parents:
4395
diff
changeset
|
2795 case MP_CMD_PAUSE : { |
13991 | 2796 cmd->pausing = 1; |
10409
4c9ca4819bed
Commands are read in a loop, but for some commands we need to break
albeu
parents:
10397
diff
changeset
|
2797 brk_cmd = 1; |
4418
8141d2c399e4
A new configurable input system and joystick support for this system
albeu
parents:
4395
diff
changeset
|
2798 } break; |
8141d2c399e4
A new configurable input system and joystick support for this system
albeu
parents:
4395
diff
changeset
|
2799 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
|
2800 exit_player_with_rc(MSGTR_Exit_quit, (cmd->nargs > 0)? cmd->args[0].v.i : 0); |
4418
8141d2c399e4
A new configurable input system and joystick support for this system
albeu
parents:
4395
diff
changeset
|
2801 } |
8141d2c399e4
A new configurable input system and joystick support for this system
albeu
parents:
4395
diff
changeset
|
2802 case MP_CMD_GRAB_FRAMES : { |
8141d2c399e4
A new configurable input system and joystick support for this system
albeu
parents:
4395
diff
changeset
|
2803 grab_frames=2; |
8141d2c399e4
A new configurable input system and joystick support for this system
albeu
parents:
4395
diff
changeset
|
2804 } break; |
8141d2c399e4
A new configurable input system and joystick support for this system
albeu
parents:
4395
diff
changeset
|
2805 case MP_CMD_PLAY_TREE_STEP : { |
8198 | 2806 int n = cmd->args[0].v.i == 0 ? 1 : cmd->args[0].v.i; |
5135 | 2807 int force = cmd->args[1].v.i; |
2808 | |
9291
64b8c5a07c2c
- It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents:
9217
diff
changeset
|
2809 #ifdef HAVE_NEW_GUI |
64b8c5a07c2c
- It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents:
9217
diff
changeset
|
2810 if (use_gui) { |
64b8c5a07c2c
- It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents:
9217
diff
changeset
|
2811 int i=0; |
64b8c5a07c2c
- It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents:
9217
diff
changeset
|
2812 if (n>0) |
64b8c5a07c2c
- It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents:
9217
diff
changeset
|
2813 for (i=0;i<n;i++) |
64b8c5a07c2c
- It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents:
9217
diff
changeset
|
2814 mplNext(); |
64b8c5a07c2c
- It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents:
9217
diff
changeset
|
2815 else |
64b8c5a07c2c
- It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents:
9217
diff
changeset
|
2816 for (i=0;i<-1*n;i++) |
64b8c5a07c2c
- It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents:
9217
diff
changeset
|
2817 mplPrev(); |
64b8c5a07c2c
- It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents:
9217
diff
changeset
|
2818 } else |
64b8c5a07c2c
- It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents:
9217
diff
changeset
|
2819 #endif |
64b8c5a07c2c
- It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents:
9217
diff
changeset
|
2820 { |
64b8c5a07c2c
- It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents:
9217
diff
changeset
|
2821 if(!force && playtree_iter) { |
5135 | 2822 play_tree_iter_t* i = play_tree_iter_new_copy(playtree_iter); |
2823 | |
2824 if(play_tree_iter_step(i,n,0) == PLAY_TREE_ITER_ENTRY) | |
2825 eof = (n > 0) ? PT_NEXT_ENTRY : PT_PREV_ENTRY; | |
2826 play_tree_iter_free(i); | |
2827 } else | |
4418
8141d2c399e4
A new configurable input system and joystick support for this system
albeu
parents:
4395
diff
changeset
|
2828 eof = (n > 0) ? PT_NEXT_ENTRY : PT_PREV_ENTRY; |
8198 | 2829 if(eof) |
2830 play_tree_step = n; | |
10409
4c9ca4819bed
Commands are read in a loop, but for some commands we need to break
albeu
parents:
10397
diff
changeset
|
2831 brk_cmd = 1; |
9291
64b8c5a07c2c
- It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents:
9217
diff
changeset
|
2832 } |
4418
8141d2c399e4
A new configurable input system and joystick support for this system
albeu
parents:
4395
diff
changeset
|
2833 } break; |
8141d2c399e4
A new configurable input system and joystick support for this system
albeu
parents:
4395
diff
changeset
|
2834 case MP_CMD_PLAY_TREE_UP_STEP : { |
8141d2c399e4
A new configurable input system and joystick support for this system
albeu
parents:
4395
diff
changeset
|
2835 int n = cmd->args[0].v.i > 0 ? 1 : -1; |
5135 | 2836 int force = cmd->args[1].v.i; |
2837 | |
9291
64b8c5a07c2c
- It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents:
9217
diff
changeset
|
2838 if(!force && playtree_iter) { |
5135 | 2839 play_tree_iter_t* i = play_tree_iter_new_copy(playtree_iter); |
2840 if(play_tree_iter_up_step(i,n,0) == PLAY_TREE_ITER_ENTRY) | |
2841 eof = (n > 0) ? PT_UP_NEXT : PT_UP_PREV; | |
2842 play_tree_iter_free(i); | |
2843 } else | |
4418
8141d2c399e4
A new configurable input system and joystick support for this system
albeu
parents:
4395
diff
changeset
|
2844 eof = (n > 0) ? PT_UP_NEXT : PT_UP_PREV; |
10409
4c9ca4819bed
Commands are read in a loop, but for some commands we need to break
albeu
parents:
10397
diff
changeset
|
2845 brk_cmd = 1; |
4418
8141d2c399e4
A new configurable input system and joystick support for this system
albeu
parents:
4395
diff
changeset
|
2846 } break; |
8141d2c399e4
A new configurable input system and joystick support for this system
albeu
parents:
4395
diff
changeset
|
2847 case MP_CMD_PLAY_ALT_SRC_STEP : { |
9352 | 2848 if(playtree_iter && playtree_iter->num_files > 1) { |
4418
8141d2c399e4
A new configurable input system and joystick support for this system
albeu
parents:
4395
diff
changeset
|
2849 int v = cmd->args[0].v.i; |
8141d2c399e4
A new configurable input system and joystick support for this system
albeu
parents:
4395
diff
changeset
|
2850 if(v > 0 && playtree_iter->file < playtree_iter->num_files) |
8141d2c399e4
A new configurable input system and joystick support for this system
albeu
parents:
4395
diff
changeset
|
2851 eof = PT_NEXT_SRC; |
8141d2c399e4
A new configurable input system and joystick support for this system
albeu
parents:
4395
diff
changeset
|
2852 else if(v < 0 && playtree_iter->file > 1) |
8141d2c399e4
A new configurable input system and joystick support for this system
albeu
parents:
4395
diff
changeset
|
2853 eof = PT_PREV_SRC; |
8141d2c399e4
A new configurable input system and joystick support for this system
albeu
parents:
4395
diff
changeset
|
2854 } |
10409
4c9ca4819bed
Commands are read in a loop, but for some commands we need to break
albeu
parents:
10397
diff
changeset
|
2855 brk_cmd = 1; |
4418
8141d2c399e4
A new configurable input system and joystick support for this system
albeu
parents:
4395
diff
changeset
|
2856 } break; |
8141d2c399e4
A new configurable input system and joystick support for this system
albeu
parents:
4395
diff
changeset
|
2857 case MP_CMD_SUB_DELAY : { |
10609
e6b63c53402e
there were no checks in MP_CMD_SUB for sh_video, so mplayer immediately segfaulted when such keys were pressed on non-video files
alex
parents:
10602
diff
changeset
|
2858 #ifdef USE_SUB |
e6b63c53402e
there were no checks in MP_CMD_SUB for sh_video, so mplayer immediately segfaulted when such keys were pressed on non-video files
alex
parents:
10602
diff
changeset
|
2859 if (sh_video) { |
4418
8141d2c399e4
A new configurable input system and joystick support for this system
albeu
parents:
4395
diff
changeset
|
2860 int abs= cmd->args[1].v.i; |
8141d2c399e4
A new configurable input system and joystick support for this system
albeu
parents:
4395
diff
changeset
|
2861 float v = cmd->args[0].v.f; |
8141d2c399e4
A new configurable input system and joystick support for this system
albeu
parents:
4395
diff
changeset
|
2862 if(abs) |
8141d2c399e4
A new configurable input system and joystick support for this system
albeu
parents:
4395
diff
changeset
|
2863 sub_delay = v; |
8141d2c399e4
A new configurable input system and joystick support for this system
albeu
parents:
4395
diff
changeset
|
2864 else |
8141d2c399e4
A new configurable input system and joystick support for this system
albeu
parents:
4395
diff
changeset
|
2865 sub_delay += v; |
8141d2c399e4
A new configurable input system and joystick support for this system
albeu
parents:
4395
diff
changeset
|
2866 osd_show_sub_delay = 9; // show the subdelay in OSD |
10609
e6b63c53402e
there were no checks in MP_CMD_SUB for sh_video, so mplayer immediately segfaulted when such keys were pressed on non-video files
alex
parents:
10602
diff
changeset
|
2867 } |
e6b63c53402e
there were no checks in MP_CMD_SUB for sh_video, so mplayer immediately segfaulted when such keys were pressed on non-video files
alex
parents:
10602
diff
changeset
|
2868 #endif |
4418
8141d2c399e4
A new configurable input system and joystick support for this system
albeu
parents:
4395
diff
changeset
|
2869 } break; |
8365
423a19edc0a4
This patch makes it possible to navigate among the subtitles while
arpi
parents:
8364
diff
changeset
|
2870 case MP_CMD_SUB_STEP : { |
10609
e6b63c53402e
there were no checks in MP_CMD_SUB for sh_video, so mplayer immediately segfaulted when such keys were pressed on non-video files
alex
parents:
10602
diff
changeset
|
2871 #ifdef USE_SUB |
e6b63c53402e
there were no checks in MP_CMD_SUB for sh_video, so mplayer immediately segfaulted when such keys were pressed on non-video files
alex
parents:
10602
diff
changeset
|
2872 if (sh_video) { |
8365
423a19edc0a4
This patch makes it possible to navigate among the subtitles while
arpi
parents:
8364
diff
changeset
|
2873 int movement = cmd->args[0].v.i; |
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9831
diff
changeset
|
2874 step_sub(subdata, sh_video->pts, movement); |
8365
423a19edc0a4
This patch makes it possible to navigate among the subtitles while
arpi
parents:
8364
diff
changeset
|
2875 osd_show_sub_delay = 9; // show the subdelay in OSD |
10609
e6b63c53402e
there were no checks in MP_CMD_SUB for sh_video, so mplayer immediately segfaulted when such keys were pressed on non-video files
alex
parents:
10602
diff
changeset
|
2876 } |
e6b63c53402e
there were no checks in MP_CMD_SUB for sh_video, so mplayer immediately segfaulted when such keys were pressed on non-video files
alex
parents:
10602
diff
changeset
|
2877 #endif |
8365
423a19edc0a4
This patch makes it possible to navigate among the subtitles while
arpi
parents:
8364
diff
changeset
|
2878 } break; |
14684 | 2879 case MP_CMD_SUB_LOG : { |
2880 #ifdef USE_SUB | |
2881 log_sub(); | |
2882 #endif | |
2883 } break; | |
10609
e6b63c53402e
there were no checks in MP_CMD_SUB for sh_video, so mplayer immediately segfaulted when such keys were pressed on non-video files
alex
parents:
10602
diff
changeset
|
2884 case MP_CMD_OSD : { |
e6b63c53402e
there were no checks in MP_CMD_SUB for sh_video, so mplayer immediately segfaulted when such keys were pressed on non-video files
alex
parents:
10602
diff
changeset
|
2885 #ifdef USE_OSD |
4587
886bf5274992
Audio only support. Include a fix in the asf demuxer opening.
albeu
parents:
4552
diff
changeset
|
2886 if(sh_video) { |
886bf5274992
Audio only support. Include a fix in the asf demuxer opening.
albeu
parents:
4552
diff
changeset
|
2887 int v = cmd->args[0].v.i; |
886bf5274992
Audio only support. Include a fix in the asf demuxer opening.
albeu
parents:
4552
diff
changeset
|
2888 if(v < 0) |
8612
a61d1b326beb
It shows not just the progressbar, but progressbar /and/ percentage
arpi
parents:
8606
diff
changeset
|
2889 osd_level=(osd_level+1)%(MAX_OSD_LEVEL+1); |
4587
886bf5274992
Audio only support. Include a fix in the asf demuxer opening.
albeu
parents:
4552
diff
changeset
|
2890 else |
8612
a61d1b326beb
It shows not just the progressbar, but progressbar /and/ percentage
arpi
parents:
8606
diff
changeset
|
2891 osd_level= v > MAX_OSD_LEVEL ? MAX_OSD_LEVEL : v; |
10609
e6b63c53402e
there were no checks in MP_CMD_SUB for sh_video, so mplayer immediately segfaulted when such keys were pressed on non-video files
alex
parents:
10602
diff
changeset
|
2892 } |
e6b63c53402e
there were no checks in MP_CMD_SUB for sh_video, so mplayer immediately segfaulted when such keys were pressed on non-video files
alex
parents:
10602
diff
changeset
|
2893 #endif |
e6b63c53402e
there were no checks in MP_CMD_SUB for sh_video, so mplayer immediately segfaulted when such keys were pressed on non-video files
alex
parents:
10602
diff
changeset
|
2894 } break; |
10116
add63fea61ac
new slave mode command to show text via osd, patch by Lars Gemeinhardt <lars.gemeinhardt at searchbroker.de> (reviewed by albeu)
faust3
parents:
10053
diff
changeset
|
2895 case MP_CMD_OSD_SHOW_TEXT : { |
add63fea61ac
new slave mode command to show text via osd, patch by Lars Gemeinhardt <lars.gemeinhardt at searchbroker.de> (reviewed by albeu)
faust3
parents:
10053
diff
changeset
|
2896 #ifdef USE_OSD |
add63fea61ac
new slave mode command to show text via osd, patch by Lars Gemeinhardt <lars.gemeinhardt at searchbroker.de> (reviewed by albeu)
faust3
parents:
10053
diff
changeset
|
2897 if(osd_level && sh_video){ |
add63fea61ac
new slave mode command to show text via osd, patch by Lars Gemeinhardt <lars.gemeinhardt at searchbroker.de> (reviewed by albeu)
faust3
parents:
10053
diff
changeset
|
2898 osd_show_text=sh_video->fps; // 1 sec |
add63fea61ac
new slave mode command to show text via osd, patch by Lars Gemeinhardt <lars.gemeinhardt at searchbroker.de> (reviewed by albeu)
faust3
parents:
10053
diff
changeset
|
2899 strncpy(osd_show_text_buffer, cmd->args[0].v.s, 64); |
add63fea61ac
new slave mode command to show text via osd, patch by Lars Gemeinhardt <lars.gemeinhardt at searchbroker.de> (reviewed by albeu)
faust3
parents:
10053
diff
changeset
|
2900 } |
add63fea61ac
new slave mode command to show text via osd, patch by Lars Gemeinhardt <lars.gemeinhardt at searchbroker.de> (reviewed by albeu)
faust3
parents:
10053
diff
changeset
|
2901 #endif |
add63fea61ac
new slave mode command to show text via osd, patch by Lars Gemeinhardt <lars.gemeinhardt at searchbroker.de> (reviewed by albeu)
faust3
parents:
10053
diff
changeset
|
2902 } break; |
4418
8141d2c399e4
A new configurable input system and joystick support for this system
albeu
parents:
4395
diff
changeset
|
2903 case MP_CMD_VOLUME : { |
8141d2c399e4
A new configurable input system and joystick support for this system
albeu
parents:
4395
diff
changeset
|
2904 int v = cmd->args[0].v.i; |
7055 | 2905 |
2906 // start change for absolute volume value | |
2907 int abs = (cmd->nargs > 1) ? cmd->args[1].v.i : 0; | |
2908 | |
13867 | 2909 #ifdef USE_EDL |
13882
8a928d5b42b8
Replaces edl_mute_count with togle making code more understandable, other trivial list suggested changes too, Patch by Oded Shimon
reynaldo
parents:
13868
diff
changeset
|
2910 if (edl_muted) break; |
13867 | 2911 user_muted = 0; |
2912 #endif | |
7055 | 2913 if( abs ) |
2914 { | |
12672
9709ce101949
New 'Mixer API' with ability to change volume through libaf (this part was written by Reimar Doffinger) and lesser global variables
alex
parents:
12550
diff
changeset
|
2915 mixer_setvolume(&mixer, (float)v, (float)v ); |
7055 | 2916 } else { |
4418
8141d2c399e4
A new configurable input system and joystick support for this system
albeu
parents:
4395
diff
changeset
|
2917 if(v > 0) |
12672
9709ce101949
New 'Mixer API' with ability to change volume through libaf (this part was written by Reimar Doffinger) and lesser global variables
alex
parents:
12550
diff
changeset
|
2918 mixer_incvolume(&mixer); |
4418
8141d2c399e4
A new configurable input system and joystick support for this system
albeu
parents:
4395
diff
changeset
|
2919 else |
12672
9709ce101949
New 'Mixer API' with ability to change volume through libaf (this part was written by Reimar Doffinger) and lesser global variables
alex
parents:
12550
diff
changeset
|
2920 mixer_decvolume(&mixer); |
7055 | 2921 } |
2922 | |
4418
8141d2c399e4
A new configurable input system and joystick support for this system
albeu
parents:
4395
diff
changeset
|
2923 #ifdef USE_OSD |
7923 | 2924 if(osd_level && sh_video){ |
12672
9709ce101949
New 'Mixer API' with ability to change volume through libaf (this part was written by Reimar Doffinger) and lesser global variables
alex
parents:
12550
diff
changeset
|
2925 float vol; |
4418
8141d2c399e4
A new configurable input system and joystick support for this system
albeu
parents:
4395
diff
changeset
|
2926 osd_visible=sh_video->fps; // 1 sec |
8141d2c399e4
A new configurable input system and joystick support for this system
albeu
parents:
4395
diff
changeset
|
2927 vo_osd_progbar_type=OSD_VOLUME; |
12672
9709ce101949
New 'Mixer API' with ability to change volume through libaf (this part was written by Reimar Doffinger) and lesser global variables
alex
parents:
12550
diff
changeset
|
2928 mixer_getbothvolume(&mixer, &vol); |
9709ce101949
New 'Mixer API' with ability to change volume through libaf (this part was written by Reimar Doffinger) and lesser global variables
alex
parents:
12550
diff
changeset
|
2929 vo_osd_progbar_value=(vol*256.0)/100.0; |
5638
86663f1b9b00
new osd code, use osd objs to follow changes and do minimal updates
arpi
parents:
5627
diff
changeset
|
2930 vo_osd_changed(OSDTYPE_PROGBAR); |
4418
8141d2c399e4
A new configurable input system and joystick support for this system
albeu
parents:
4395
diff
changeset
|
2931 } |
8141d2c399e4
A new configurable input system and joystick support for this system
albeu
parents:
4395
diff
changeset
|
2932 #endif |
8141d2c399e4
A new configurable input system and joystick support for this system
albeu
parents:
4395
diff
changeset
|
2933 } break; |
6940
335d827e8201
10l bug (missing break;) found by Jim Hawkins <jim@jawkins.com>
arpi
parents:
6930
diff
changeset
|
2934 case MP_CMD_MUTE: |
13867 | 2935 #ifdef USE_EDL |
13882
8a928d5b42b8
Replaces edl_mute_count with togle making code more understandable, other trivial list suggested changes too, Patch by Oded Shimon
reynaldo
parents:
13868
diff
changeset
|
2936 user_muted = !user_muted; |
8a928d5b42b8
Replaces edl_mute_count with togle making code more understandable, other trivial list suggested changes too, Patch by Oded Shimon
reynaldo
parents:
13868
diff
changeset
|
2937 if ((edl_muted | user_muted) != mixer.muted) |
13867 | 2938 #endif |
12672
9709ce101949
New 'Mixer API' with ability to change volume through libaf (this part was written by Reimar Doffinger) and lesser global variables
alex
parents:
12550
diff
changeset
|
2939 mixer_mute(&mixer); |
6940
335d827e8201
10l bug (missing break;) found by Jim Hawkins <jim@jawkins.com>
arpi
parents:
6930
diff
changeset
|
2940 break; |
6818
b9a6817d9ff3
Add loadfile and loadlist commands. May be buggy if the filename contain some
albeu
parents:
6796
diff
changeset
|
2941 case MP_CMD_LOADFILE : { |
b9a6817d9ff3
Add loadfile and loadlist commands. May be buggy if the filename contain some
albeu
parents:
6796
diff
changeset
|
2942 play_tree_t* e = play_tree_new(); |
b9a6817d9ff3
Add loadfile and loadlist commands. May be buggy if the filename contain some
albeu
parents:
6796
diff
changeset
|
2943 play_tree_add_file(e,cmd->args[0].v.s); |
b9a6817d9ff3
Add loadfile and loadlist commands. May be buggy if the filename contain some
albeu
parents:
6796
diff
changeset
|
2944 |
b9a6817d9ff3
Add loadfile and loadlist commands. May be buggy if the filename contain some
albeu
parents:
6796
diff
changeset
|
2945 // Go back to the start point |
b9a6817d9ff3
Add loadfile and loadlist commands. May be buggy if the filename contain some
albeu
parents:
6796
diff
changeset
|
2946 while(play_tree_iter_up_step(playtree_iter,0,1) != PLAY_TREE_ITER_END) |
b9a6817d9ff3
Add loadfile and loadlist commands. May be buggy if the filename contain some
albeu
parents:
6796
diff
changeset
|
2947 /* NOP */; |
b9a6817d9ff3
Add loadfile and loadlist commands. May be buggy if the filename contain some
albeu
parents:
6796
diff
changeset
|
2948 play_tree_free_list(playtree->child,1); |
b9a6817d9ff3
Add loadfile and loadlist commands. May be buggy if the filename contain some
albeu
parents:
6796
diff
changeset
|
2949 play_tree_set_child(playtree,e); |
b9a6817d9ff3
Add loadfile and loadlist commands. May be buggy if the filename contain some
albeu
parents:
6796
diff
changeset
|
2950 play_tree_iter_step(playtree_iter,0,0); |
b9a6817d9ff3
Add loadfile and loadlist commands. May be buggy if the filename contain some
albeu
parents:
6796
diff
changeset
|
2951 eof = PT_NEXT_SRC; |
10409
4c9ca4819bed
Commands are read in a loop, but for some commands we need to break
albeu
parents:
10397
diff
changeset
|
2952 brk_cmd = 1; |
6818
b9a6817d9ff3
Add loadfile and loadlist commands. May be buggy if the filename contain some
albeu
parents:
6796
diff
changeset
|
2953 } break; |
b9a6817d9ff3
Add loadfile and loadlist commands. May be buggy if the filename contain some
albeu
parents:
6796
diff
changeset
|
2954 case MP_CMD_LOADLIST : { |
b9a6817d9ff3
Add loadfile and loadlist commands. May be buggy if the filename contain some
albeu
parents:
6796
diff
changeset
|
2955 play_tree_t* e = parse_playlist_file(cmd->args[0].v.s); |
b9a6817d9ff3
Add loadfile and loadlist commands. May be buggy if the filename contain some
albeu
parents:
6796
diff
changeset
|
2956 if(!e) |
6930 | 2957 mp_msg(MSGT_CPLAYER,MSGL_ERR,MSGTR_PlaylistLoadUnable,cmd->args[0].v.s); |
6818
b9a6817d9ff3
Add loadfile and loadlist commands. May be buggy if the filename contain some
albeu
parents:
6796
diff
changeset
|
2958 else { |
b9a6817d9ff3
Add loadfile and loadlist commands. May be buggy if the filename contain some
albeu
parents:
6796
diff
changeset
|
2959 // Go back to the start point |
b9a6817d9ff3
Add loadfile and loadlist commands. May be buggy if the filename contain some
albeu
parents:
6796
diff
changeset
|
2960 while(play_tree_iter_up_step(playtree_iter,0,1) != PLAY_TREE_ITER_END) |
b9a6817d9ff3
Add loadfile and loadlist commands. May be buggy if the filename contain some
albeu
parents:
6796
diff
changeset
|
2961 /* NOP */; |
b9a6817d9ff3
Add loadfile and loadlist commands. May be buggy if the filename contain some
albeu
parents:
6796
diff
changeset
|
2962 play_tree_free_list(playtree->child,1); |
b9a6817d9ff3
Add loadfile and loadlist commands. May be buggy if the filename contain some
albeu
parents:
6796
diff
changeset
|
2963 play_tree_set_child(playtree,e); |
b9a6817d9ff3
Add loadfile and loadlist commands. May be buggy if the filename contain some
albeu
parents:
6796
diff
changeset
|
2964 play_tree_iter_step(playtree_iter,0,0); |
b9a6817d9ff3
Add loadfile and loadlist commands. May be buggy if the filename contain some
albeu
parents:
6796
diff
changeset
|
2965 eof = PT_NEXT_SRC; |
b9a6817d9ff3
Add loadfile and loadlist commands. May be buggy if the filename contain some
albeu
parents:
6796
diff
changeset
|
2966 } |
10409
4c9ca4819bed
Commands are read in a loop, but for some commands we need to break
albeu
parents:
10397
diff
changeset
|
2967 brk_cmd = 1; |
4418
8141d2c399e4
A new configurable input system and joystick support for this system
albeu
parents:
4395
diff
changeset
|
2968 } break; |
7517
9d433771b6d0
-vf eq2, LUT-based brightness/contrast/gamma correction (Y-only)
arpi
parents:
7516
diff
changeset
|
2969 case MP_CMD_GAMMA : { |
9d433771b6d0
-vf eq2, LUT-based brightness/contrast/gamma correction (Y-only)
arpi
parents:
7516
diff
changeset
|
2970 int v = cmd->args[0].v.i, abs = cmd->args[1].v.i; |
9d433771b6d0
-vf eq2, LUT-based brightness/contrast/gamma correction (Y-only)
arpi
parents:
7516
diff
changeset
|
2971 |
9d433771b6d0
-vf eq2, LUT-based brightness/contrast/gamma correction (Y-only)
arpi
parents:
7516
diff
changeset
|
2972 if (!sh_video) |
9d433771b6d0
-vf eq2, LUT-based brightness/contrast/gamma correction (Y-only)
arpi
parents:
7516
diff
changeset
|
2973 break; |
9d433771b6d0
-vf eq2, LUT-based brightness/contrast/gamma correction (Y-only)
arpi
parents:
7516
diff
changeset
|
2974 |
9d433771b6d0
-vf eq2, LUT-based brightness/contrast/gamma correction (Y-only)
arpi
parents:
7516
diff
changeset
|
2975 if (vo_gamma_gamma == 1000) |
9d433771b6d0
-vf eq2, LUT-based brightness/contrast/gamma correction (Y-only)
arpi
parents:
7516
diff
changeset
|
2976 { |
9d433771b6d0
-vf eq2, LUT-based brightness/contrast/gamma correction (Y-only)
arpi
parents:
7516
diff
changeset
|
2977 vo_gamma_gamma = 0; |
9d433771b6d0
-vf eq2, LUT-based brightness/contrast/gamma correction (Y-only)
arpi
parents:
7516
diff
changeset
|
2978 get_video_colors (sh_video, "gamma", &vo_gamma_gamma); |
9d433771b6d0
-vf eq2, LUT-based brightness/contrast/gamma correction (Y-only)
arpi
parents:
7516
diff
changeset
|
2979 } |
9d433771b6d0
-vf eq2, LUT-based brightness/contrast/gamma correction (Y-only)
arpi
parents:
7516
diff
changeset
|
2980 |
9d433771b6d0
-vf eq2, LUT-based brightness/contrast/gamma correction (Y-only)
arpi
parents:
7516
diff
changeset
|
2981 if (abs) |
9d433771b6d0
-vf eq2, LUT-based brightness/contrast/gamma correction (Y-only)
arpi
parents:
7516
diff
changeset
|
2982 vo_gamma_gamma = v; |
9d433771b6d0
-vf eq2, LUT-based brightness/contrast/gamma correction (Y-only)
arpi
parents:
7516
diff
changeset
|
2983 else |
9d433771b6d0
-vf eq2, LUT-based brightness/contrast/gamma correction (Y-only)
arpi
parents:
7516
diff
changeset
|
2984 vo_gamma_gamma += v; |
9d433771b6d0
-vf eq2, LUT-based brightness/contrast/gamma correction (Y-only)
arpi
parents:
7516
diff
changeset
|
2985 |
9d433771b6d0
-vf eq2, LUT-based brightness/contrast/gamma correction (Y-only)
arpi
parents:
7516
diff
changeset
|
2986 if (vo_gamma_gamma > 100) |
9d433771b6d0
-vf eq2, LUT-based brightness/contrast/gamma correction (Y-only)
arpi
parents:
7516
diff
changeset
|
2987 vo_gamma_gamma = 100; |
9d433771b6d0
-vf eq2, LUT-based brightness/contrast/gamma correction (Y-only)
arpi
parents:
7516
diff
changeset
|
2988 else if (vo_gamma_gamma < -100) |
9d433771b6d0
-vf eq2, LUT-based brightness/contrast/gamma correction (Y-only)
arpi
parents:
7516
diff
changeset
|
2989 vo_gamma_gamma = -100; |
9d433771b6d0
-vf eq2, LUT-based brightness/contrast/gamma correction (Y-only)
arpi
parents:
7516
diff
changeset
|
2990 set_video_colors(sh_video, "gamma", vo_gamma_gamma); |
9d433771b6d0
-vf eq2, LUT-based brightness/contrast/gamma correction (Y-only)
arpi
parents:
7516
diff
changeset
|
2991 #ifdef USE_OSD |
9d433771b6d0
-vf eq2, LUT-based brightness/contrast/gamma correction (Y-only)
arpi
parents:
7516
diff
changeset
|
2992 if(osd_level){ |
9d433771b6d0
-vf eq2, LUT-based brightness/contrast/gamma correction (Y-only)
arpi
parents:
7516
diff
changeset
|
2993 osd_visible=sh_video->fps; // 1 sec |
9d433771b6d0
-vf eq2, LUT-based brightness/contrast/gamma correction (Y-only)
arpi
parents:
7516
diff
changeset
|
2994 vo_osd_progbar_type=OSD_BRIGHTNESS; |
9d433771b6d0
-vf eq2, LUT-based brightness/contrast/gamma correction (Y-only)
arpi
parents:
7516
diff
changeset
|
2995 vo_osd_progbar_value=(vo_gamma_gamma<<7)/100 + 128; |
9d433771b6d0
-vf eq2, LUT-based brightness/contrast/gamma correction (Y-only)
arpi
parents:
7516
diff
changeset
|
2996 vo_osd_changed(OSDTYPE_PROGBAR); |
9d433771b6d0
-vf eq2, LUT-based brightness/contrast/gamma correction (Y-only)
arpi
parents:
7516
diff
changeset
|
2997 } |
9d433771b6d0
-vf eq2, LUT-based brightness/contrast/gamma correction (Y-only)
arpi
parents:
7516
diff
changeset
|
2998 #endif // USE_OSD |
9d433771b6d0
-vf eq2, LUT-based brightness/contrast/gamma correction (Y-only)
arpi
parents:
7516
diff
changeset
|
2999 } break; |
4418
8141d2c399e4
A new configurable input system and joystick support for this system
albeu
parents:
4395
diff
changeset
|
3000 case MP_CMD_BRIGHTNESS : { |
8141d2c399e4
A new configurable input system and joystick support for this system
albeu
parents:
4395
diff
changeset
|
3001 int v = cmd->args[0].v.i, abs = cmd->args[1].v.i; |
6786 | 3002 |
3003 if (!sh_video) | |
3004 break; | |
3005 | |
3006 if (vo_gamma_brightness == 1000) | |
3007 { | |
3008 vo_gamma_brightness = 0; | |
3009 get_video_colors(sh_video, "brightness", &vo_gamma_brightness); | |
3010 } | |
3011 | |
6781 | 3012 if (abs) |
3013 vo_gamma_brightness = v; | |
3014 else | |
3015 vo_gamma_brightness += v; | |
3016 | |
3017 if (vo_gamma_brightness > 100) | |
3018 vo_gamma_brightness = 100; | |
3019 else if (vo_gamma_brightness < -100) | |
3020 vo_gamma_brightness = -100; | |
3021 if(set_video_colors(sh_video, "brightness", vo_gamma_brightness)){ | |
4418
8141d2c399e4
A new configurable input system and joystick support for this system
albeu
parents:
4395
diff
changeset
|
3022 #ifdef USE_OSD |
6755 | 3023 if(osd_level){ |
3024 osd_visible=sh_video->fps; // 1 sec | |
3025 vo_osd_progbar_type=OSD_BRIGHTNESS; | |
3026 vo_osd_progbar_value=(vo_gamma_brightness<<7)/100 + 128; | |
3027 vo_osd_changed(OSDTYPE_PROGBAR); | |
3028 } | |
3029 #endif // USE_OSD | |
3030 } | |
4418
8141d2c399e4
A new configurable input system and joystick support for this system
albeu
parents:
4395
diff
changeset
|
3031 } break; |
6781 | 3032 case MP_CMD_CONTRAST : { |
4418
8141d2c399e4
A new configurable input system and joystick support for this system
albeu
parents:
4395
diff
changeset
|
3033 int v = cmd->args[0].v.i, abs = cmd->args[1].v.i; |
6786 | 3034 |
3035 if (!sh_video) | |
3036 break; | |
3037 | |
3038 if (vo_gamma_contrast == 1000) | |
3039 { | |
3040 vo_gamma_contrast = 0; | |
3041 get_video_colors(sh_video, "contrast", &vo_gamma_contrast); | |
3042 } | |
6781 | 3043 |
3044 if (abs) | |
3045 vo_gamma_contrast = v; | |
3046 else | |
3047 vo_gamma_contrast += v; | |
3048 | |
3049 if (vo_gamma_contrast > 100) | |
3050 vo_gamma_contrast = 100; | |
3051 else if (vo_gamma_contrast < -100) | |
3052 vo_gamma_contrast = -100; | |
3053 if(set_video_colors(sh_video, "contrast", vo_gamma_contrast)){ | |
3054 #ifdef USE_OSD | |
3055 if(osd_level){ | |
3056 osd_visible=sh_video->fps; // 1 sec | |
3057 vo_osd_progbar_type=OSD_CONTRAST; | |
3058 vo_osd_progbar_value=(vo_gamma_contrast<<7)/100 + 128; | |
3059 vo_osd_changed(OSDTYPE_PROGBAR); | |
3060 } | |
3061 #endif // USE_OSD | |
4418
8141d2c399e4
A new configurable input system and joystick support for this system
albeu
parents:
4395
diff
changeset
|
3062 } |
8141d2c399e4
A new configurable input system and joystick support for this system
albeu
parents:
4395
diff
changeset
|
3063 } break; |
8141d2c399e4
A new configurable input system and joystick support for this system
albeu
parents:
4395
diff
changeset
|
3064 case MP_CMD_SATURATION : { |
8141d2c399e4
A new configurable input system and joystick support for this system
albeu
parents:
4395
diff
changeset
|
3065 int v = cmd->args[0].v.i, abs = cmd->args[1].v.i; |
6786 | 3066 |
3067 if (!sh_video) | |
3068 break; | |
3069 | |
3070 if (vo_gamma_saturation == 1000) | |
3071 { | |
3072 vo_gamma_saturation = 0; | |
3073 get_video_colors(sh_video, "saturation", &vo_gamma_saturation); | |
3074 } | |
3075 | |
6781 | 3076 if (abs) |
3077 vo_gamma_saturation = v; | |
3078 else | |
3079 vo_gamma_saturation += v; | |
3080 | |
3081 if (vo_gamma_saturation > 100) | |
3082 vo_gamma_saturation = 100; | |
3083 else if (vo_gamma_saturation < -100) | |
3084 vo_gamma_saturation = -100; | |
3085 if(set_video_colors(sh_video, "saturation", vo_gamma_saturation)){ | |
3086 #ifdef USE_OSD | |
3087 if(osd_level){ | |
3088 osd_visible=sh_video->fps; // 1 sec | |
3089 vo_osd_progbar_type=OSD_SATURATION; | |
3090 vo_osd_progbar_value=(vo_gamma_saturation<<7)/100 + 128; | |
3091 vo_osd_changed(OSDTYPE_PROGBAR); | |
3092 } | |
3093 #endif // USE_OSD | |
4418
8141d2c399e4
A new configurable input system and joystick support for this system
albeu
parents:
4395
diff
changeset
|
3094 } |
6781 | 3095 } break; |
3096 case MP_CMD_HUE : { | |
3097 int v = cmd->args[0].v.i, abs = cmd->args[1].v.i; | |
6786 | 3098 |
3099 if (!sh_video) | |
3100 break; | |
3101 | |
3102 if (vo_gamma_hue == 1000) | |
3103 { | |
3104 vo_gamma_hue = 0; | |
3105 get_video_colors(sh_video, "hue", &vo_gamma_hue); | |
3106 } | |
6781 | 3107 |
3108 if (abs) | |
3109 vo_gamma_hue = v; | |
3110 else | |
3111 vo_gamma_hue += v; | |
3112 | |
3113 if (vo_gamma_hue > 100) | |
3114 vo_gamma_hue = 100; | |
3115 else if (vo_gamma_hue < -100) | |
3116 vo_gamma_hue = -100; | |
3117 if(set_video_colors(sh_video, "hue", vo_gamma_hue)){ | |
4418
8141d2c399e4
A new configurable input system and joystick support for this system
albeu
parents:
4395
diff
changeset
|
3118 #ifdef USE_OSD |
6781 | 3119 if(osd_level){ |
3120 osd_visible=sh_video->fps; // 1 sec | |
3121 vo_osd_progbar_type=OSD_HUE; | |
3122 vo_osd_progbar_value=(vo_gamma_hue<<7)/100 + 128; | |
3123 vo_osd_changed(OSDTYPE_PROGBAR); | |
3124 } | |
3125 #endif // USE_OSD | |
4418
8141d2c399e4
A new configurable input system and joystick support for this system
albeu
parents:
4395
diff
changeset
|
3126 } |
8141d2c399e4
A new configurable input system and joystick support for this system
albeu
parents:
4395
diff
changeset
|
3127 } break; |
8141d2c399e4
A new configurable input system and joystick support for this system
albeu
parents:
4395
diff
changeset
|
3128 case MP_CMD_FRAMEDROPPING : { |
8141d2c399e4
A new configurable input system and joystick support for this system
albeu
parents:
4395
diff
changeset
|
3129 int v = cmd->args[0].v.i; |
11936 | 3130 if(v < 0){ |
4418
8141d2c399e4
A new configurable input system and joystick support for this system
albeu
parents:
4395
diff
changeset
|
3131 frame_dropping = (frame_dropping+1)%3; |
11936 | 3132 #ifdef USE_OSD |
3133 osd_show_framedropping=10; | |
3134 vo_osd_changed(OSDTYPE_SUBTITLE); | |
3135 #endif | |
3136 } | |
4418
8141d2c399e4
A new configurable input system and joystick support for this system
albeu
parents:
4395
diff
changeset
|
3137 else |
8141d2c399e4
A new configurable input system and joystick support for this system
albeu
parents:
4395
diff
changeset
|
3138 frame_dropping = v > 2 ? 2 : v; |
8141d2c399e4
A new configurable input system and joystick support for this system
albeu
parents:
4395
diff
changeset
|
3139 } break; |
8141d2c399e4
A new configurable input system and joystick support for this system
albeu
parents:
4395
diff
changeset
|
3140 #ifdef USE_TV |
10521
141141fdd250
I'd like to change tv tuner frequency in the slave mode. So this patch
gabucino
parents:
10453
diff
changeset
|
3141 case MP_CMD_TV_SET_FREQ : { |
141141fdd250
I'd like to change tv tuner frequency in the slave mode. So this patch
gabucino
parents:
10453
diff
changeset
|
3142 if (file_format == DEMUXER_TYPE_TV) |
141141fdd250
I'd like to change tv tuner frequency in the slave mode. So this patch
gabucino
parents:
10453
diff
changeset
|
3143 tv_set_freq((tvi_handle_t*)(demuxer->priv), cmd->args[0].v.f * 16.0); |
141141fdd250
I'd like to change tv tuner frequency in the slave mode. So this patch
gabucino
parents:
10453
diff
changeset
|
3144 } break; |
141141fdd250
I'd like to change tv tuner frequency in the slave mode. So this patch
gabucino
parents:
10453
diff
changeset
|
3145 case MP_CMD_TV_SET_NORM : { |
141141fdd250
I'd like to change tv tuner frequency in the slave mode. So this patch
gabucino
parents:
10453
diff
changeset
|
3146 if (file_format == DEMUXER_TYPE_TV) |
141141fdd250
I'd like to change tv tuner frequency in the slave mode. So this patch
gabucino
parents:
10453
diff
changeset
|
3147 tv_set_norm((tvi_handle_t*)(demuxer->priv), cmd->args[0].v.s); |
141141fdd250
I'd like to change tv tuner frequency in the slave mode. So this patch
gabucino
parents:
10453
diff
changeset
|
3148 } break; |
10577 | 3149 case MP_CMD_TV_SET_BRIGHTNESS : { |
3150 if (file_format == DEMUXER_TYPE_TV) | |
3151 tv_set_color_options((tvi_handle_t*)(demuxer->priv), TV_COLOR_BRIGHTNESS, cmd->args[0].v.i); | |
3152 } break; | |
3153 case MP_CMD_TV_SET_HUE : { | |
3154 if (file_format == DEMUXER_TYPE_TV) | |
3155 tv_set_color_options((tvi_handle_t*)(demuxer->priv), TV_COLOR_HUE, cmd->args[0].v.i); | |
3156 } break; | |
3157 case MP_CMD_TV_SET_SATURATION : { | |
3158 if (file_format == DEMUXER_TYPE_TV) | |
3159 tv_set_color_options((tvi_handle_t*)(demuxer->priv), TV_COLOR_SATURATION, cmd->args[0].v.i); | |
3160 } break; | |
3161 case MP_CMD_TV_SET_CONTRAST : { | |
3162 if (file_format == DEMUXER_TYPE_TV) | |
3163 tv_set_color_options((tvi_handle_t*)(demuxer->priv), TV_COLOR_CONTRAST, cmd->args[0].v.i); | |
3164 } break; | |
4418
8141d2c399e4
A new configurable input system and joystick support for this system
albeu
parents:
4395
diff
changeset
|
3165 case MP_CMD_TV_STEP_CHANNEL : { |
9752 | 3166 if (file_format == DEMUXER_TYPE_TV) { |
4418
8141d2c399e4
A new configurable input system and joystick support for this system
albeu
parents:
4395
diff
changeset
|
3167 int v = cmd->args[0].v.i; |
8627
14ab71b47a58
user friendly channel tuning + 10L fix in tvi_v4l (by Stephane Jourdois)
henry
parents:
8619
diff
changeset
|
3168 if(v > 0){ |
7419 | 3169 tv_step_channel((tvi_handle_t*)(demuxer->priv), TV_CHANNEL_HIGHER); |
8627
14ab71b47a58
user friendly channel tuning + 10L fix in tvi_v4l (by Stephane Jourdois)
henry
parents:
8619
diff
changeset
|
3170 #ifdef USE_OSD |
14ab71b47a58
user friendly channel tuning + 10L fix in tvi_v4l (by Stephane Jourdois)
henry
parents:
8619
diff
changeset
|
3171 if (tv_channel_list) { |
14ab71b47a58
user friendly channel tuning + 10L fix in tvi_v4l (by Stephane Jourdois)
henry
parents:
8619
diff
changeset
|
3172 osd_show_tv_channel = sh_video->fps; |
14ab71b47a58
user friendly channel tuning + 10L fix in tvi_v4l (by Stephane Jourdois)
henry
parents:
8619
diff
changeset
|
3173 vo_osd_changed(OSDTYPE_SUBTITLE); |
14ab71b47a58
user friendly channel tuning + 10L fix in tvi_v4l (by Stephane Jourdois)
henry
parents:
8619
diff
changeset
|
3174 } |
14ab71b47a58
user friendly channel tuning + 10L fix in tvi_v4l (by Stephane Jourdois)
henry
parents:
8619
diff
changeset
|
3175 #endif |
14ab71b47a58
user friendly channel tuning + 10L fix in tvi_v4l (by Stephane Jourdois)
henry
parents:
8619
diff
changeset
|
3176 } else { |
7419 | 3177 tv_step_channel((tvi_handle_t*)(demuxer->priv), TV_CHANNEL_LOWER); |
8627
14ab71b47a58
user friendly channel tuning + 10L fix in tvi_v4l (by Stephane Jourdois)
henry
parents:
8619
diff
changeset
|
3178 #ifdef USE_OSD |
14ab71b47a58
user friendly channel tuning + 10L fix in tvi_v4l (by Stephane Jourdois)
henry
parents:
8619
diff
changeset
|
3179 if (tv_channel_list) { |
14ab71b47a58
user friendly channel tuning + 10L fix in tvi_v4l (by Stephane Jourdois)
henry
parents:
8619
diff
changeset
|
3180 osd_show_tv_channel = sh_video->fps; |
14ab71b47a58
user friendly channel tuning + 10L fix in tvi_v4l (by Stephane Jourdois)
henry
parents:
8619
diff
changeset
|
3181 vo_osd_changed(OSDTYPE_SUBTITLE); |
14ab71b47a58
user friendly channel tuning + 10L fix in tvi_v4l (by Stephane Jourdois)
henry
parents:
8619
diff
changeset
|
3182 } |
14ab71b47a58
user friendly channel tuning + 10L fix in tvi_v4l (by Stephane Jourdois)
henry
parents:
8619
diff
changeset
|
3183 #endif |
14ab71b47a58
user friendly channel tuning + 10L fix in tvi_v4l (by Stephane Jourdois)
henry
parents:
8619
diff
changeset
|
3184 } |
4418
8141d2c399e4
A new configurable input system and joystick support for this system
albeu
parents:
4395
diff
changeset
|
3185 } |
9610 | 3186 } |
3187 #ifdef HAS_DVBIN_SUPPORT | |
10560 | 3188 if((stream->type == STREAMTYPE_DVB) && stream->priv) |
9610 | 3189 { |
10560 | 3190 dvb_priv_t *priv = (dvb_priv_t*) stream->priv; |
3191 if(priv->is_on) | |
3192 { | |
3193 int dir; | |
9610 | 3194 int v = cmd->args[0].v.i; |
10708 | 3195 |
3196 last_dvb_step = v; | |
9610 | 3197 if(v > 0) |
10560 | 3198 dir = DVB_CHANNEL_HIGHER; |
9610 | 3199 else |
10560 | 3200 dir = DVB_CHANNEL_LOWER; |
3201 | |
3202 | |
3203 if(dvb_step_channel(priv, dir)) | |
3204 { | |
10707
0d9ef9b4841c
dvb channel changing vs input system (lirc) fix by David Kuehling <dvdkhlng@gmx.de>
alex
parents:
10691
diff
changeset
|
3205 uninit_player(INITED_ALL-(INITED_STREAM|INITED_INPUT)); |
11352 | 3206 cache_uninit(stream); |
3207 goto goto_enable_cache; | |
10560 | 3208 } |
3209 } | |
9610 | 3210 } |
10560 | 3211 #endif |
9610 | 3212 break; |
8494 | 3213 case MP_CMD_TV_SET_CHANNEL : { |
9752 | 3214 if (file_format == DEMUXER_TYPE_TV) { |
8494 | 3215 tv_set_channel((tvi_handle_t*)(demuxer->priv), cmd->args[0].v.s); |
8627
14ab71b47a58
user friendly channel tuning + 10L fix in tvi_v4l (by Stephane Jourdois)
henry
parents:
8619
diff
changeset
|
3216 #ifdef USE_OSD |
14ab71b47a58
user friendly channel tuning + 10L fix in tvi_v4l (by Stephane Jourdois)
henry
parents:
8619
diff
changeset
|
3217 if (tv_channel_list) { |
14ab71b47a58
user friendly channel tuning + 10L fix in tvi_v4l (by Stephane Jourdois)
henry
parents:
8619
diff
changeset
|
3218 osd_show_tv_channel = sh_video->fps; |
14ab71b47a58
user friendly channel tuning + 10L fix in tvi_v4l (by Stephane Jourdois)
henry
parents:
8619
diff
changeset
|
3219 vo_osd_changed(OSDTYPE_SUBTITLE); |
14ab71b47a58
user friendly channel tuning + 10L fix in tvi_v4l (by Stephane Jourdois)
henry
parents:
8619
diff
changeset
|
3220 } |
14ab71b47a58
user friendly channel tuning + 10L fix in tvi_v4l (by Stephane Jourdois)
henry
parents:
8619
diff
changeset
|
3221 #endif |
14ab71b47a58
user friendly channel tuning + 10L fix in tvi_v4l (by Stephane Jourdois)
henry
parents:
8619
diff
changeset
|
3222 } |
14ab71b47a58
user friendly channel tuning + 10L fix in tvi_v4l (by Stephane Jourdois)
henry
parents:
8619
diff
changeset
|
3223 } break; |
10560 | 3224 #ifdef HAS_DVBIN_SUPPORT |
3225 case MP_CMD_DVB_SET_CHANNEL: | |
3226 { | |
3227 if((stream->type == STREAMTYPE_DVB) && stream->priv) | |
3228 { | |
3229 dvb_priv_t *priv = (dvb_priv_t*) stream->priv; | |
3230 if(priv->is_on) | |
3231 { | |
10708 | 3232 if(priv->list->current <= cmd->args[0].v.i) |
3233 last_dvb_step = 1; | |
3234 else | |
3235 last_dvb_step = -1; | |
3236 | |
12306
661a6e80030f
slave command dvb_set_channel now takes 2 arguments: channel card
nicodvb
parents:
12207
diff
changeset
|
3237 if(dvb_set_channel(priv, cmd->args[1].v.i, cmd->args[0].v.i)) |
10560 | 3238 { |
10707
0d9ef9b4841c
dvb channel changing vs input system (lirc) fix by David Kuehling <dvdkhlng@gmx.de>
alex
parents:
10691
diff
changeset
|
3239 uninit_player(INITED_ALL-(INITED_STREAM|INITED_INPUT)); |
11352 | 3240 cache_uninit(stream); |
3241 goto goto_enable_cache; | |
10560 | 3242 } |
3243 } | |
3244 } | |
3245 } | |
3246 #endif | |
8627
14ab71b47a58
user friendly channel tuning + 10L fix in tvi_v4l (by Stephane Jourdois)
henry
parents:
8619
diff
changeset
|
3247 case MP_CMD_TV_LAST_CHANNEL : { |
9752 | 3248 if (file_format == DEMUXER_TYPE_TV) { |
8627
14ab71b47a58
user friendly channel tuning + 10L fix in tvi_v4l (by Stephane Jourdois)
henry
parents:
8619
diff
changeset
|
3249 tv_last_channel((tvi_handle_t*)(demuxer->priv)); |
14ab71b47a58
user friendly channel tuning + 10L fix in tvi_v4l (by Stephane Jourdois)
henry
parents:
8619
diff
changeset
|
3250 #ifdef USE_OSD |
14ab71b47a58
user friendly channel tuning + 10L fix in tvi_v4l (by Stephane Jourdois)
henry
parents:
8619
diff
changeset
|
3251 if (tv_channel_list) { |
14ab71b47a58
user friendly channel tuning + 10L fix in tvi_v4l (by Stephane Jourdois)
henry
parents:
8619
diff
changeset
|
3252 osd_show_tv_channel = sh_video->fps; |
14ab71b47a58
user friendly channel tuning + 10L fix in tvi_v4l (by Stephane Jourdois)
henry
parents:
8619
diff
changeset
|
3253 vo_osd_changed(OSDTYPE_SUBTITLE); |
14ab71b47a58
user friendly channel tuning + 10L fix in tvi_v4l (by Stephane Jourdois)
henry
parents:
8619
diff
changeset
|
3254 } |
14ab71b47a58
user friendly channel tuning + 10L fix in tvi_v4l (by Stephane Jourdois)
henry
parents:
8619
diff
changeset
|
3255 #endif |
14ab71b47a58
user friendly channel tuning + 10L fix in tvi_v4l (by Stephane Jourdois)
henry
parents:
8619
diff
changeset
|
3256 } |
8494 | 3257 } break; |
4418
8141d2c399e4
A new configurable input system and joystick support for this system
albeu
parents:
4395
diff
changeset
|
3258 case MP_CMD_TV_STEP_NORM : { |
9752 | 3259 if (file_format == DEMUXER_TYPE_TV) |
7419 | 3260 tv_step_norm((tvi_handle_t*)(demuxer->priv)); |
4418
8141d2c399e4
A new configurable input system and joystick support for this system
albeu
parents:
4395
diff
changeset
|
3261 } break; |
8141d2c399e4
A new configurable input system and joystick support for this system
albeu
parents:
4395
diff
changeset
|
3262 case MP_CMD_TV_STEP_CHANNEL_LIST : { |
9752 | 3263 if (file_format == DEMUXER_TYPE_TV) |
7419 | 3264 tv_step_chanlist((tvi_handle_t*)(demuxer->priv)); |
4418
8141d2c399e4
A new configurable input system and joystick support for this system
albeu
parents:
4395
diff
changeset
|
3265 } break; |
4849
9be4ac85dd35
Moved the call to VOCTRL_FULLSCREEN outside of #ifdef USE_TV block
albeu
parents:
4844
diff
changeset
|
3266 #endif |
13228
a47aaa6b7324
slave mode command to en/disable vsync, patch by Aurelien Jacobs <aurel at gnuage.org>
faust3
parents:
13168
diff
changeset
|
3267 case MP_CMD_SWITCH_VSYNC: { |
a47aaa6b7324
slave mode command to en/disable vsync, patch by Aurelien Jacobs <aurel at gnuage.org>
faust3
parents:
13168
diff
changeset
|
3268 vo_vsync = ( cmd->nargs > 0 )? cmd->args[0].v.i : !vo_vsync; |
a47aaa6b7324
slave mode command to en/disable vsync, patch by Aurelien Jacobs <aurel at gnuage.org>
faust3
parents:
13168
diff
changeset
|
3269 } break; |
4733
5bad0d74f6ea
standard key support for video out runtime fullscreen switching
alex
parents:
4693
diff
changeset
|
3270 case MP_CMD_VO_FULLSCREEN: |
5bad0d74f6ea
standard key support for video out runtime fullscreen switching
alex
parents:
4693
diff
changeset
|
3271 { |
4858 | 3272 #ifdef HAVE_NEW_GUI |
3273 if ( use_gui ) guiGetEvent( guiIEvent,(char *)MP_CMD_GUI_FULLSCREEN ); | |
3274 else | |
3275 #endif | |
5511 | 3276 if(video_out && vo_config_count) video_out->control(VOCTRL_FULLSCREEN, 0); |
4733
5bad0d74f6ea
standard key support for video out runtime fullscreen switching
alex
parents:
4693
diff
changeset
|
3277 } break; |
11542 | 3278 case MP_CMD_VO_ONTOP: |
3279 { | |
3280 if(video_out && vo_config_count) { | |
3281 video_out->control(VOCTRL_ONTOP, 0); | |
3282 #ifdef USE_OSD | |
3283 osd_show_ontop=10; | |
3284 vo_osd_changed(OSDTYPE_SUBTITLE); | |
3285 #endif | |
3286 } | |
3287 | |
3288 } break; | |
13091 | 3289 case MP_CMD_VO_ROOTWIN: |
3290 { | |
3291 if(video_out && vo_config_count) { | |
3292 video_out->control(VOCTRL_ROOTWIN, 0); | |
3293 #ifdef USE_OSD | |
3294 osd_show_rootwin=10; | |
3295 vo_osd_changed(OSDTYPE_SUBTITLE); | |
3296 #endif | |
3297 } | |
3298 | |
3299 } break; | |
6304
ee65527096c2
pan&scan support with -vo xv by ?? <mplayer@svennevid.net>
arpi
parents:
6280
diff
changeset
|
3300 case MP_CMD_PANSCAN : { |
6311
da2dda48b7ec
add mute support ( step 1 ) and fixed panscan bugs (1000l for me)
pontscho
parents:
6307
diff
changeset
|
3301 if ( !video_out ) break; |
6307 | 3302 if ( video_out->control( VOCTRL_GET_PANSCAN,NULL ) == VO_TRUE ) |
3303 { | |
3304 int abs= cmd->args[1].v.i; | |
3305 float v = cmd->args[0].v.f; | |
3306 float res; | |
3307 if(abs) res = v; | |
3308 else res = vo_panscan+v; | |
3309 vo_panscan = res > 1 ? 1 : res < 0 ? 0 : res; | |
3310 video_out->control( VOCTRL_SET_PANSCAN,NULL ); | |
6304
ee65527096c2
pan&scan support with -vo xv by ?? <mplayer@svennevid.net>
arpi
parents:
6280
diff
changeset
|
3311 #ifdef USE_OSD |
7923 | 3312 if(osd_level && sh_video){ |
6307 | 3313 osd_visible=sh_video->fps; // 1 sec |
3314 vo_osd_progbar_type=OSD_PANSCAN; | |
3315 vo_osd_progbar_value=vo_panscan*256; | |
3316 vo_osd_changed(OSDTYPE_PROGBAR); | |
14053 | 3317 } |
8819 | 3318 #ifdef HAVE_FREETYPE |
14053 | 3319 if (sh_video && (subtitle_autoscale == 2 || subtitle_autoscale == 3)) |
9346 | 3320 // force scaling font to movie width or diagonal |
8819 | 3321 force_load_font = 1; |
3322 #endif | |
6304
ee65527096c2
pan&scan support with -vo xv by ?? <mplayer@svennevid.net>
arpi
parents:
6280
diff
changeset
|
3323 #endif |
6307 | 3324 } |
6304
ee65527096c2
pan&scan support with -vo xv by ?? <mplayer@svennevid.net>
arpi
parents:
6280
diff
changeset
|
3325 } break; |
5015
9842148f6053
-subpos key bindings with new input layer - patch by Tomas Konir <moje@molly.vabo.cz>
arpi
parents:
4981
diff
changeset
|
3326 case MP_CMD_SUB_POS: |
9842148f6053
-subpos key bindings with new input layer - patch by Tomas Konir <moje@molly.vabo.cz>
arpi
parents:
4981
diff
changeset
|
3327 { |
10609
e6b63c53402e
there were no checks in MP_CMD_SUB for sh_video, so mplayer immediately segfaulted when such keys were pressed on non-video files
alex
parents:
10602
diff
changeset
|
3328 #ifdef USE_SUB |
e6b63c53402e
there were no checks in MP_CMD_SUB for sh_video, so mplayer immediately segfaulted when such keys were pressed on non-video files
alex
parents:
10602
diff
changeset
|
3329 if (sh_video) { |
5015
9842148f6053
-subpos key bindings with new input layer - patch by Tomas Konir <moje@molly.vabo.cz>
arpi
parents:
4981
diff
changeset
|
3330 int v; |
9842148f6053
-subpos key bindings with new input layer - patch by Tomas Konir <moje@molly.vabo.cz>
arpi
parents:
4981
diff
changeset
|
3331 v = cmd->args[0].v.i; |
9842148f6053
-subpos key bindings with new input layer - patch by Tomas Konir <moje@molly.vabo.cz>
arpi
parents:
4981
diff
changeset
|
3332 |
9842148f6053
-subpos key bindings with new input layer - patch by Tomas Konir <moje@molly.vabo.cz>
arpi
parents:
4981
diff
changeset
|
3333 sub_pos+=v; |
9842148f6053
-subpos key bindings with new input layer - patch by Tomas Konir <moje@molly.vabo.cz>
arpi
parents:
4981
diff
changeset
|
3334 if(sub_pos >100) sub_pos=100; |
9842148f6053
-subpos key bindings with new input layer - patch by Tomas Konir <moje@molly.vabo.cz>
arpi
parents:
4981
diff
changeset
|
3335 if(sub_pos <0) sub_pos=0; |
5640 | 3336 vo_osd_changed(OSDTYPE_SUBTITLE); |
8366
3e3b30d16719
With this patch the text 'Sub position: x/100' is displayed
arpi
parents:
8365
diff
changeset
|
3337 osd_show_sub_pos = 9; |
10609
e6b63c53402e
there were no checks in MP_CMD_SUB for sh_video, so mplayer immediately segfaulted when such keys were pressed on non-video files
alex
parents:
10602
diff
changeset
|
3338 } |
e6b63c53402e
there were no checks in MP_CMD_SUB for sh_video, so mplayer immediately segfaulted when such keys were pressed on non-video files
alex
parents:
10602
diff
changeset
|
3339 #endif |
e6b63c53402e
there were no checks in MP_CMD_SUB for sh_video, so mplayer immediately segfaulted when such keys were pressed on non-video files
alex
parents:
10602
diff
changeset
|
3340 } break; |
8534
922ce27eb683
This patch adds support for vertical subtitle alignment
arpi
parents:
8531
diff
changeset
|
3341 case MP_CMD_SUB_ALIGNMENT: |
922ce27eb683
This patch adds support for vertical subtitle alignment
arpi
parents:
8531
diff
changeset
|
3342 { |
10609
e6b63c53402e
there were no checks in MP_CMD_SUB for sh_video, so mplayer immediately segfaulted when such keys were pressed on non-video files
alex
parents:
10602
diff
changeset
|
3343 #ifdef USE_SUB |
e6b63c53402e
there were no checks in MP_CMD_SUB for sh_video, so mplayer immediately segfaulted when such keys were pressed on non-video files
alex
parents:
10602
diff
changeset
|
3344 if (sh_video) { |
8534
922ce27eb683
This patch adds support for vertical subtitle alignment
arpi
parents:
8531
diff
changeset
|
3345 if (cmd->nargs >= 1) |
922ce27eb683
This patch adds support for vertical subtitle alignment
arpi
parents:
8531
diff
changeset
|
3346 sub_alignment = cmd->args[0].v.i; |
922ce27eb683
This patch adds support for vertical subtitle alignment
arpi
parents:
8531
diff
changeset
|
3347 else |
922ce27eb683
This patch adds support for vertical subtitle alignment
arpi
parents:
8531
diff
changeset
|
3348 sub_alignment = (sub_alignment+1) % 3; |
922ce27eb683
This patch adds support for vertical subtitle alignment
arpi
parents:
8531
diff
changeset
|
3349 osd_show_sub_alignment = 9; |
922ce27eb683
This patch adds support for vertical subtitle alignment
arpi
parents:
8531
diff
changeset
|
3350 vo_osd_changed(OSDTYPE_SUBTITLE); |
10609
e6b63c53402e
there were no checks in MP_CMD_SUB for sh_video, so mplayer immediately segfaulted when such keys were pressed on non-video files
alex
parents:
10602
diff
changeset
|
3351 } |
e6b63c53402e
there were no checks in MP_CMD_SUB for sh_video, so mplayer immediately segfaulted when such keys were pressed on non-video files
alex
parents:
10602
diff
changeset
|
3352 #endif |
e6b63c53402e
there were no checks in MP_CMD_SUB for sh_video, so mplayer immediately segfaulted when such keys were pressed on non-video files
alex
parents:
10602
diff
changeset
|
3353 } break; |
7628
d6608342591d
This patch adds the functionality to disable/enable subtitles while playing
arpi
parents:
7621
diff
changeset
|
3354 case MP_CMD_SUB_VISIBILITY: |
d6608342591d
This patch adds the functionality to disable/enable subtitles while playing
arpi
parents:
7621
diff
changeset
|
3355 { |
10609
e6b63c53402e
there were no checks in MP_CMD_SUB for sh_video, so mplayer immediately segfaulted when such keys were pressed on non-video files
alex
parents:
10602
diff
changeset
|
3356 #ifdef USE_SUB |
e6b63c53402e
there were no checks in MP_CMD_SUB for sh_video, so mplayer immediately segfaulted when such keys were pressed on non-video files
alex
parents:
10602
diff
changeset
|
3357 if (sh_video) { |
7628
d6608342591d
This patch adds the functionality to disable/enable subtitles while playing
arpi
parents:
7621
diff
changeset
|
3358 sub_visibility=1-sub_visibility; |
d6608342591d
This patch adds the functionality to disable/enable subtitles while playing
arpi
parents:
7621
diff
changeset
|
3359 osd_show_sub_visibility = 9; // show state of subtitle visibility in OSD |
d6608342591d
This patch adds the functionality to disable/enable subtitles while playing
arpi
parents:
7621
diff
changeset
|
3360 vo_osd_changed(OSDTYPE_SUBTITLE); |
10609
e6b63c53402e
there were no checks in MP_CMD_SUB for sh_video, so mplayer immediately segfaulted when such keys were pressed on non-video files
alex
parents:
10602
diff
changeset
|
3361 } |
e6b63c53402e
there were no checks in MP_CMD_SUB for sh_video, so mplayer immediately segfaulted when such keys were pressed on non-video files
alex
parents:
10602
diff
changeset
|
3362 #endif |
e6b63c53402e
there were no checks in MP_CMD_SUB for sh_video, so mplayer immediately segfaulted when such keys were pressed on non-video files
alex
parents:
10602
diff
changeset
|
3363 } break; |
10884
bbdaa93c469e
slave mode commands to print out vo_fs and sub_visibility globals, patch by Mike Swieton <swietonm at student.gvsu.edu>
faust3
parents:
10718
diff
changeset
|
3364 case MP_CMD_GET_SUB_VISIBILITY: |
bbdaa93c469e
slave mode commands to print out vo_fs and sub_visibility globals, patch by Mike Swieton <swietonm at student.gvsu.edu>
faust3
parents:
10718
diff
changeset
|
3365 { |
bbdaa93c469e
slave mode commands to print out vo_fs and sub_visibility globals, patch by Mike Swieton <swietonm at student.gvsu.edu>
faust3
parents:
10718
diff
changeset
|
3366 #ifdef USE_SUB |
bbdaa93c469e
slave mode commands to print out vo_fs and sub_visibility globals, patch by Mike Swieton <swietonm at student.gvsu.edu>
faust3
parents:
10718
diff
changeset
|
3367 if (sh_video) { |
13577 | 3368 mp_msg(MSGT_GLOBAL,MSGL_INFO,MSGTR_AnsSubVisibility, sub_visibility); |
10884
bbdaa93c469e
slave mode commands to print out vo_fs and sub_visibility globals, patch by Mike Swieton <swietonm at student.gvsu.edu>
faust3
parents:
10718
diff
changeset
|
3369 } |
bbdaa93c469e
slave mode commands to print out vo_fs and sub_visibility globals, patch by Mike Swieton <swietonm at student.gvsu.edu>
faust3
parents:
10718
diff
changeset
|
3370 #endif |
bbdaa93c469e
slave mode commands to print out vo_fs and sub_visibility globals, patch by Mike Swieton <swietonm at student.gvsu.edu>
faust3
parents:
10718
diff
changeset
|
3371 } break; |
12841
96b807836eca
individual sub_select option not interferring with vobsub_lang
alex
parents:
12835
diff
changeset
|
3372 case MP_CMD_SUB_SELECT: |
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
|
3373 if (global_sub_size) { |
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
|
3374 int source = -1; |
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
|
3375 |
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
|
3376 global_sub_pos++; |
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
|
3377 if (global_sub_pos >= global_sub_size) |
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
|
3378 global_sub_pos = -1; |
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
|
3379 if (global_sub_pos >= 0) |
a5004eb92a79
fix sub_select fiasco with global sub numbering. now multiple sub sources can be managed in essentially one list.
joey
parents:
13500
diff
changeset
|
3380 source = sub_source(); |
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
|
3381 |
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
|
3382 mp_msg(MSGT_CPLAYER, MSGL_DBG3, "subtitles: %d subs, (v@%d s@%d d@%d), @%d, source @%d\n", |
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
|
3383 global_sub_size, global_sub_indices[SUB_SOURCE_VOBSUB], |
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
|
3384 global_sub_indices[SUB_SOURCE_SUBS], global_sub_indices[SUB_SOURCE_DEMUX], |
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
|
3385 global_sub_pos, source); |
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
|
3386 |
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
|
3387 #ifdef USE_SUB |
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
|
3388 set_of_sub_pos = -1; |
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
|
3389 subdata = NULL; |
14684 | 3390 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
|
3391 #endif |
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
|
3392 vobsub_id = -1; |
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
|
3393 dvdsub_id = -1; |
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
|
3394 if (d_dvdsub) d_dvdsub->id = -1; |
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
|
3395 |
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
|
3396 // be careful! |
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
|
3397 // if sub_changed is till on but subdata's been reset, bad things happen. |
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
|
3398 osd_show_vobsub_changed = 0; |
a5004eb92a79
fix sub_select fiasco with global sub numbering. now multiple sub sources can be managed in essentially one list.
joey
parents:
13500
diff
changeset
|
3399 osd_show_sub_changed = 0; |
a5004eb92a79
fix sub_select fiasco with global sub numbering. now multiple sub sources can be managed in essentially one list.
joey
parents:
13500
diff
changeset
|
3400 |
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
|
3401 if (source == SUB_SOURCE_VOBSUB) { |
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
|
3402 vobsub_id = global_sub_pos - global_sub_indices[SUB_SOURCE_VOBSUB]; |
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
|
3403 if (!global_sub_quiet_osd_hack) osd_show_vobsub_changed = sh_video->fps; |
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
|
3404 #ifdef USE_SUB |
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
|
3405 } else if (source == SUB_SOURCE_SUBS) { |
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
|
3406 set_of_sub_pos = global_sub_pos - global_sub_indices[SUB_SOURCE_SUBS]; |
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
|
3407 subdata = set_of_subtitles[set_of_sub_pos]; |
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
|
3408 if (!global_sub_quiet_osd_hack) osd_show_sub_changed = sh_video->fps; |
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
|
3409 vo_osd_changed(OSDTYPE_SUBTITLE); |
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
|
3410 |
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
|
3411 // FIXME: is this the correct place for these? |
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
|
3412 if(stream_dump_type==3) list_sub_file(subdata); |
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
|
3413 if(stream_dump_type==4) dump_mpsub(subdata, sh_video->fps); |
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
|
3414 if(stream_dump_type==6) dump_srt(subdata, sh_video->fps); |
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
|
3415 if(stream_dump_type==7) dump_microdvd(subdata, sh_video->fps); |
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
|
3416 if(stream_dump_type==8) dump_jacosub(subdata, sh_video->fps); |
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
|
3417 if(stream_dump_type==9) dump_sami(subdata, sh_video->fps); |
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
|
3418 #endif |
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
|
3419 } else if (source == SUB_SOURCE_DEMUX) { |
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
|
3420 dvdsub_id = global_sub_pos - global_sub_indices[SUB_SOURCE_DEMUX]; |
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
|
3421 if (d_dvdsub) { |
13092
36701f60f093
forgot some ifdef's and broke mplayer.c without ogg & dvdread
joey
parents:
13091
diff
changeset
|
3422 #ifdef USE_DVDREAD |
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
|
3423 if (vo_spudec && stream->type == STREAMTYPE_DVD) { |
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
|
3424 d_dvdsub->id = dvdsub_id; |
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
|
3425 spudec_reset(vo_spudec); |
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
|
3426 } |
13092
36701f60f093
forgot some ifdef's and broke mplayer.c without ogg & dvdread
joey
parents:
13091
diff
changeset
|
3427 #endif |
36701f60f093
forgot some ifdef's and broke mplayer.c without ogg & dvdread
joey
parents:
13091
diff
changeset
|
3428 #ifdef HAVE_OGGVORBIS |
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
|
3429 if (demuxer->type == DEMUXER_TYPE_OGG) |
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
|
3430 d_dvdsub->id = demux_ogg_sub_id(demuxer, dvdsub_id); |
13092
36701f60f093
forgot some ifdef's and broke mplayer.c without ogg & dvdread
joey
parents:
13091
diff
changeset
|
3431 #endif |
13126 | 3432 #ifdef HAVE_MATROSKA |
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
|
3433 if (demuxer->type == DEMUXER_TYPE_MATROSKA) { |
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
|
3434 d_dvdsub->id = demux_mkv_change_subs(demuxer, dvdsub_id); |
13126 | 3435 if (d_dvdsub->id >= 0 && ((mkv_sh_sub_t *)d_dvdsub->sh)->type == 'v') { |
3436 mkv_sh_sub_t *mkv_sh_sub = (mkv_sh_sub_t *)d_dvdsub->sh; | |
3437 if (vo_spudec != NULL) | |
3438 spudec_free(vo_spudec); | |
3439 vo_spudec = | |
14561
a226d301eec1
Handle missing palettes in the info part of VobSubs in Matroska files correctly by giving mplayer a NULL pointer. This way it will use a default palette instead of black only. Patch by Csillag Kristof (fenwick () freemail ! hu)
mosu
parents:
14530
diff
changeset
|
3440 spudec_new_scaled_vobsub(mkv_sh_sub->has_palette ? mkv_sh_sub->palette : NULL, mkv_sh_sub->colors, |
13126 | 3441 mkv_sh_sub->custom_colors, |
3442 mkv_sh_sub->width, | |
3443 mkv_sh_sub->height); | |
3444 if (!forced_subs_only) | |
3445 forced_subs_only = mkv_sh_sub->forced_subs_only; | |
3446 if (vo_spudec) { | |
3447 spudec_set_forced_subs_only(vo_spudec, forced_subs_only); | |
3448 inited_flags |= INITED_SPUDEC; | |
3449 } | |
3450 } | |
3451 } | |
3452 #endif | |
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
|
3453 } |
a5004eb92a79
fix sub_select fiasco with global sub numbering. now multiple sub sources can be managed in essentially one list.
joey
parents:
13500
diff
changeset
|
3454 if (!global_sub_quiet_osd_hack) osd_show_vobsub_changed = sh_video->fps; |
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
|
3455 } else { // off |
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
|
3456 if (!global_sub_quiet_osd_hack) osd_show_vobsub_changed = sh_video->fps; |
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
|
3457 #ifdef USE_SUB |
a5004eb92a79
fix sub_select fiasco with global sub numbering. now multiple sub sources can be managed in essentially one list.
joey
parents:
13500
diff
changeset
|
3458 vo_osd_changed(OSDTYPE_SUBTITLE); |
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
|
3459 #endif |
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
|
3460 } |
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
|
3461 // it's annoying and dumb to show osd saying "off" at every subless file... |
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
|
3462 global_sub_quiet_osd_hack = 0; |
a5004eb92a79
fix sub_select fiasco with global sub numbering. now multiple sub sources can be managed in essentially one list.
joey
parents:
13500
diff
changeset
|
3463 } |
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9831
diff
changeset
|
3464 break; |
10917
d45870f67728
Forced subtitles patch by Arne Driescher <driescher@mpi-magdeburg.mpg.de>
attila
parents:
10884
diff
changeset
|
3465 case MP_CMD_SUB_FORCED_ONLY: |
d45870f67728
Forced subtitles patch by Arne Driescher <driescher@mpi-magdeburg.mpg.de>
attila
parents:
10884
diff
changeset
|
3466 if (vo_spudec) { |
d45870f67728
Forced subtitles patch by Arne Driescher <driescher@mpi-magdeburg.mpg.de>
attila
parents:
10884
diff
changeset
|
3467 forced_subs_only = forced_subs_only ? 0 : ~0; // toggle state |
d45870f67728
Forced subtitles patch by Arne Driescher <driescher@mpi-magdeburg.mpg.de>
attila
parents:
10884
diff
changeset
|
3468 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
|
3469 } |
d45870f67728
Forced subtitles patch by Arne Driescher <driescher@mpi-magdeburg.mpg.de>
attila
parents:
10884
diff
changeset
|
3470 break; |
6112 | 3471 case MP_CMD_SCREENSHOT : |
3472 if(vo_config_count) video_out->control(VOCTRL_SCREENSHOT, NULL); | |
3473 break; | |
6888
2dde1a1bc03a
Add the input command "change_rectangle" to control the rectangle
kmkaplan
parents:
6871
diff
changeset
|
3474 case MP_CMD_VF_CHANGE_RECTANGLE: |
2dde1a1bc03a
Add the input command "change_rectangle" to control the rectangle
kmkaplan
parents:
6871
diff
changeset
|
3475 set_rectangle(sh_video, cmd->args[0].v.i, cmd->args[1].v.i); |
2dde1a1bc03a
Add the input command "change_rectangle" to control the rectangle
kmkaplan
parents:
6871
diff
changeset
|
3476 break; |
8364 | 3477 |
3478 case MP_CMD_GET_TIME_LENGTH : { | |
13577 | 3479 mp_msg(MSGT_GLOBAL,MSGL_INFO,MSGTR_AnsLength, demuxer_get_time_length(demuxer)); |
8364 | 3480 } break; |
3481 | |
10884
bbdaa93c469e
slave mode commands to print out vo_fs and sub_visibility globals, patch by Mike Swieton <swietonm at student.gvsu.edu>
faust3
parents:
10718
diff
changeset
|
3482 case MP_CMD_GET_VO_FULLSCREEN : { |
bbdaa93c469e
slave mode commands to print out vo_fs and sub_visibility globals, patch by Mike Swieton <swietonm at student.gvsu.edu>
faust3
parents:
10718
diff
changeset
|
3483 if(video_out && vo_config_count) |
13577 | 3484 mp_msg(MSGT_GLOBAL,MSGL_INFO,MSGTR_AnsVoFullscreen, vo_fs); |
10884
bbdaa93c469e
slave mode commands to print out vo_fs and sub_visibility globals, patch by Mike Swieton <swietonm at student.gvsu.edu>
faust3
parents:
10718
diff
changeset
|
3485 } break; |
bbdaa93c469e
slave mode commands to print out vo_fs and sub_visibility globals, patch by Mike Swieton <swietonm at student.gvsu.edu>
faust3
parents:
10718
diff
changeset
|
3486 |
8364 | 3487 case MP_CMD_GET_PERCENT_POS : { |
13577 | 3488 mp_msg(MSGT_GLOBAL,MSGL_INFO,MSGTR_AnsPercentPos, demuxer_get_percent_pos(demuxer)); |
8364 | 3489 } break; |
14087 | 3490 case MP_CMD_RUN : { |
13353
65207324b932
make it possible to use the run command from a menu config file, based on a patch by Aurelien Jacobs <aurel@gnuage.org>
faust3
parents:
13341
diff
changeset
|
3491 #ifndef __MINGW32__ |
65207324b932
make it possible to use the run command from a menu config file, based on a patch by Aurelien Jacobs <aurel@gnuage.org>
faust3
parents:
13341
diff
changeset
|
3492 if(!fork()) { |
65207324b932
make it possible to use the run command from a menu config file, based on a patch by Aurelien Jacobs <aurel@gnuage.org>
faust3
parents:
13341
diff
changeset
|
3493 execl("/bin/sh","sh","-c",cmd->args[0].v.s,NULL); |
65207324b932
make it possible to use the run command from a menu config file, based on a patch by Aurelien Jacobs <aurel@gnuage.org>
faust3
parents:
13341
diff
changeset
|
3494 exit(0); |
65207324b932
make it possible to use the run command from a menu config file, based on a patch by Aurelien Jacobs <aurel@gnuage.org>
faust3
parents:
13341
diff
changeset
|
3495 } |
65207324b932
make it possible to use the run command from a menu config file, based on a patch by Aurelien Jacobs <aurel@gnuage.org>
faust3
parents:
13341
diff
changeset
|
3496 #endif |
65207324b932
make it possible to use the run command from a menu config file, based on a patch by Aurelien Jacobs <aurel@gnuage.org>
faust3
parents:
13341
diff
changeset
|
3497 } break; |
8364 | 3498 |
5380
8a01cde9cf39
DVDnav support patch by David Holm and Kees Cook <mplayer@outflux.net>
arpi
parents:
5367
diff
changeset
|
3499 #ifdef USE_DVDNAV |
5489
5e6e08ff47d5
dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents:
5488
diff
changeset
|
3500 case MP_CMD_DVDNAV_EVENT: { |
5e6e08ff47d5
dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents:
5488
diff
changeset
|
3501 dvdnav_priv_t * dvdnav_priv = (dvdnav_priv_t*)(stream->priv); |
5e6e08ff47d5
dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents:
5488
diff
changeset
|
3502 dvdnav_event_t * dvdnav_event = (dvdnav_event_t *)(cmd->args[0].v.v); |
5e6e08ff47d5
dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents:
5488
diff
changeset
|
3503 |
5627 | 3504 /* ignore these events if we're not in dvd_nav mode */ |
9752 | 3505 if (stream->type != STREAMTYPE_DVDNAV) break; |
5627 | 3506 |
5489
5e6e08ff47d5
dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents:
5488
diff
changeset
|
3507 if (!dvdnav_event) { |
13577 | 3508 mp_msg(MSGT_FIXME, MSGL_FIXME, MSGTR_DvdnavNullEvent); |
5489
5e6e08ff47d5
dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents:
5488
diff
changeset
|
3509 break; |
5e6e08ff47d5
dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents:
5488
diff
changeset
|
3510 } |
5e6e08ff47d5
dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents:
5488
diff
changeset
|
3511 |
5e6e08ff47d5
dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents:
5488
diff
changeset
|
3512 //printf("mplayer: got event: %d\n",dvdnav_event->event); |
5e6e08ff47d5
dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents:
5488
diff
changeset
|
3513 |
5e6e08ff47d5
dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents:
5488
diff
changeset
|
3514 switch (dvdnav_event->event) { |
5e6e08ff47d5
dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents:
5488
diff
changeset
|
3515 case DVDNAV_BLOCK_OK: { |
5e6e08ff47d5
dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents:
5488
diff
changeset
|
3516 /* be silent about this one */ |
5e6e08ff47d5
dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents:
5488
diff
changeset
|
3517 break; |
5e6e08ff47d5
dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents:
5488
diff
changeset
|
3518 } |
5e6e08ff47d5
dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents:
5488
diff
changeset
|
3519 case DVDNAV_HIGHLIGHT: { |
5e6e08ff47d5
dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents:
5488
diff
changeset
|
3520 dvdnav_highlight_event_t *hevent = (dvdnav_highlight_event_t*)(dvdnav_event->details); |
5e6e08ff47d5
dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents:
5488
diff
changeset
|
3521 if (!hevent) { |
13577 | 3522 mp_msg(MSGT_FIXME, MSGL_FIXME, MSGTR_DvdnavHighlightEventBroken); |
5489
5e6e08ff47d5
dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents:
5488
diff
changeset
|
3523 break; |
5e6e08ff47d5
dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents:
5488
diff
changeset
|
3524 } |
5e6e08ff47d5
dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents:
5488
diff
changeset
|
3525 |
5e6e08ff47d5
dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents:
5488
diff
changeset
|
3526 if (hevent->display && hevent->buttonN>0) |
5e6e08ff47d5
dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents:
5488
diff
changeset
|
3527 { |
5e6e08ff47d5
dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents:
5488
diff
changeset
|
3528 //dvdnav_priv->seen_root_menu=1; /* if we got a highlight, we're on a menu */ |
5e6e08ff47d5
dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents:
5488
diff
changeset
|
3529 sprintf( dvd_nav_text, "Highlight button %d (%u,%u)-(%u,%u) PTS %d (now is %5.2f)", |
5e6e08ff47d5
dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents:
5488
diff
changeset
|
3530 hevent->buttonN, |
5e6e08ff47d5
dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents:
5488
diff
changeset
|
3531 hevent->sx,hevent->sy, |
5e6e08ff47d5
dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents:
5488
diff
changeset
|
3532 hevent->ex,hevent->ey, |
5e6e08ff47d5
dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents:
5488
diff
changeset
|
3533 hevent->pts, d_video->pts); |
13577 | 3534 mp_msg(MSGT_FIXME, MSGL_FIXME, MSGTR_DvdnavEvent,dvd_nav_text); |
5489
5e6e08ff47d5
dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents:
5488
diff
changeset
|
3535 //osd_show_dvd_nav_delay = 60; |
5e6e08ff47d5
dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents:
5488
diff
changeset
|
3536 |
5e6e08ff47d5
dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents:
5488
diff
changeset
|
3537 osd_show_dvd_nav_highlight=1; |
5e6e08ff47d5
dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents:
5488
diff
changeset
|
3538 osd_show_dvd_nav_sx=hevent->sx; |
5e6e08ff47d5
dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents:
5488
diff
changeset
|
3539 osd_show_dvd_nav_ex=hevent->ex; |
5e6e08ff47d5
dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents:
5488
diff
changeset
|
3540 osd_show_dvd_nav_sy=hevent->sy; |
5e6e08ff47d5
dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents:
5488
diff
changeset
|
3541 osd_show_dvd_nav_ey=hevent->ey; |
5e6e08ff47d5
dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents:
5488
diff
changeset
|
3542 } |
5e6e08ff47d5
dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents:
5488
diff
changeset
|
3543 else { |
5e6e08ff47d5
dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents:
5488
diff
changeset
|
3544 osd_show_dvd_nav_highlight=0; |
13577 | 3545 mp_msg(MSGT_FIXME, MSGL_FIXME, MSGTR_DvdnavHighlightHide); |
5489
5e6e08ff47d5
dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents:
5488
diff
changeset
|
3546 } |
5e6e08ff47d5
dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents:
5488
diff
changeset
|
3547 break; |
5e6e08ff47d5
dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents:
5488
diff
changeset
|
3548 } |
5e6e08ff47d5
dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents:
5488
diff
changeset
|
3549 case DVDNAV_STILL_FRAME: { |
5e6e08ff47d5
dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents:
5488
diff
changeset
|
3550 dvdnav_still_event_t *still_event = (dvdnav_still_event_t*)(dvdnav_event->details); |
5e6e08ff47d5
dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents:
5488
diff
changeset
|
3551 |
13577 | 3552 mp_msg(MSGT_FIXME, MSGL_FIXME, MSGTR_DvdnavStillFrame, still_event->length ); |
5489
5e6e08ff47d5
dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents:
5488
diff
changeset
|
3553 while (dvdnav_stream_sleeping(dvdnav_priv)) { |
9464 | 3554 usec_sleep(1000); /* 1ms */ |
5489
5e6e08ff47d5
dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents:
5488
diff
changeset
|
3555 } |
5e6e08ff47d5
dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents:
5488
diff
changeset
|
3556 dvdnav_stream_sleep(dvdnav_priv,still_event->length); |
5e6e08ff47d5
dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents:
5488
diff
changeset
|
3557 break; |
5e6e08ff47d5
dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents:
5488
diff
changeset
|
3558 } |
5e6e08ff47d5
dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents:
5488
diff
changeset
|
3559 case DVDNAV_STOP: { |
13577 | 3560 mp_msg(MSGT_FIXME, MSGL_FIXME, MSGTR_DvdnavNavStop ); |
5489
5e6e08ff47d5
dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents:
5488
diff
changeset
|
3561 break; |
5e6e08ff47d5
dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents:
5488
diff
changeset
|
3562 } |
5e6e08ff47d5
dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents:
5488
diff
changeset
|
3563 case DVDNAV_NOP: { |
13577 | 3564 mp_msg(MSGT_FIXME, MSGL_FIXME, MSGTR_DvdnavNavNOP); |
5489
5e6e08ff47d5
dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents:
5488
diff
changeset
|
3565 break; |
5e6e08ff47d5
dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents:
5488
diff
changeset
|
3566 } |
5e6e08ff47d5
dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents:
5488
diff
changeset
|
3567 case DVDNAV_SPU_STREAM_CHANGE: { |
6971 | 3568 #if DVDNAVVERSION > 012 |
3569 dvdnav_spu_stream_change_event_t *stream_change = (dvdnav_spu_stream_change_event_t*)(dvdnav_event->details); | |
3570 | |
13577 | 3571 mp_msg(MSGT_FIXME, MSGL_FIXME, MSGTR_DvdnavNavSpuStreamChangeVerbose, |
6971 | 3572 stream_change->physical_wide, |
3573 stream_change->physical_letterbox, | |
3574 stream_change->physical_pan_scan, | |
3575 stream_change->logical); | |
3576 | |
3577 if (vo_spudec && dvdsub_id!=stream_change->physical_wide) { | |
3578 mp_msg(MSGT_INPUT,MSGL_DBG2,"d_dvdsub->id change: was %d is now %d\n", | |
3579 d_dvdsub->id,stream_change->physical_wide); | |
3580 // FIXME: need a better way to change SPU id | |
3581 d_dvdsub->id=dvdsub_id=stream_change->physical_wide; | |
3582 if (vo_spudec) spudec_reset(vo_spudec); | |
3583 } | |
3584 #else | |
3585 dvdnav_stream_change_event_t *stream_change = (dvdnav_stream_change_event_t*)(dvdnav_event->details); | |
5489
5e6e08ff47d5
dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents:
5488
diff
changeset
|
3586 |
13577 | 3587 mp_msg(MSGT_FIXME, MSGL_FIXME, MSGTR_DvdnavNavSpuStreamChange, |
5489
5e6e08ff47d5
dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents:
5488
diff
changeset
|
3588 stream_change->physical, |
5e6e08ff47d5
dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents:
5488
diff
changeset
|
3589 stream_change->logical); |
5e6e08ff47d5
dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents:
5488
diff
changeset
|
3590 |
5e6e08ff47d5
dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents:
5488
diff
changeset
|
3591 if (vo_spudec && dvdsub_id!=stream_change->physical) { |
5e6e08ff47d5
dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents:
5488
diff
changeset
|
3592 mp_msg(MSGT_INPUT,MSGL_DBG2,"d_dvdsub->id change: was %d is now %d\n", |
5e6e08ff47d5
dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents:
5488
diff
changeset
|
3593 d_dvdsub->id,stream_change->physical); |
5e6e08ff47d5
dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents:
5488
diff
changeset
|
3594 // FIXME: need a better way to change SPU id |
5e6e08ff47d5
dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents:
5488
diff
changeset
|
3595 d_dvdsub->id=dvdsub_id=stream_change->physical; |
5e6e08ff47d5
dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents:
5488
diff
changeset
|
3596 if (vo_spudec) spudec_reset(vo_spudec); |
5e6e08ff47d5
dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents:
5488
diff
changeset
|
3597 } |
6971 | 3598 #endif |
5489
5e6e08ff47d5
dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents:
5488
diff
changeset
|
3599 break; |
5e6e08ff47d5
dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents:
5488
diff
changeset
|
3600 } |
5e6e08ff47d5
dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents:
5488
diff
changeset
|
3601 case DVDNAV_AUDIO_STREAM_CHANGE: { |
5e6e08ff47d5
dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents:
5488
diff
changeset
|
3602 int aid_temp; |
6971 | 3603 #if DVDNAVVERSION > 012 |
3604 dvdnav_audio_stream_change_event_t *stream_change = (dvdnav_audio_stream_change_event_t*)(dvdnav_event->details); | |
3605 #else | |
5489
5e6e08ff47d5
dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents:
5488
diff
changeset
|
3606 dvdnav_stream_change_event_t *stream_change = (dvdnav_stream_change_event_t*)(dvdnav_event->details); |
6971 | 3607 #endif |
5489
5e6e08ff47d5
dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents:
5488
diff
changeset
|
3608 |
13577 | 3609 mp_msg(MSGT_FIXME, MSGL_FIXME, MSGTR_DvdnavNavAudioStreamChange, |
5489
5e6e08ff47d5
dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents:
5488
diff
changeset
|
3610 stream_change->physical, |
5e6e08ff47d5
dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents:
5488
diff
changeset
|
3611 stream_change->logical); |
5e6e08ff47d5
dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents:
5488
diff
changeset
|
3612 |
5e6e08ff47d5
dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents:
5488
diff
changeset
|
3613 aid_temp=stream_change->physical; |
5e6e08ff47d5
dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents:
5488
diff
changeset
|
3614 if (aid_temp>=0) aid_temp+=128; // FIXME: is this sane? |
5e6e08ff47d5
dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents:
5488
diff
changeset
|
3615 if (d_audio && audio_id!=aid_temp) { |
5e6e08ff47d5
dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents:
5488
diff
changeset
|
3616 mp_msg(MSGT_INPUT,MSGL_DBG2,"d_audio->id change: was %d is now %d\n", |
5e6e08ff47d5
dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents:
5488
diff
changeset
|
3617 d_audio->id,aid_temp); |
5e6e08ff47d5
dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents:
5488
diff
changeset
|
3618 // FIXME: need a bettery way to change audio stream id |
5e6e08ff47d5
dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents:
5488
diff
changeset
|
3619 d_audio->id=dvdsub_id=aid_temp; |
8593
2c7870bf81db
sh_audio==NULL hotfix by Robert Varga <nite@hq.alert.sk>
arpi
parents:
8535
diff
changeset
|
3620 if(sh_audio) resync_audio_stream(sh_audio); |
5489
5e6e08ff47d5
dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents:
5488
diff
changeset
|
3621 } |
5e6e08ff47d5
dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents:
5488
diff
changeset
|
3622 |
5e6e08ff47d5
dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents:
5488
diff
changeset
|
3623 break; |
5e6e08ff47d5
dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents:
5488
diff
changeset
|
3624 } |
5e6e08ff47d5
dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents:
5488
diff
changeset
|
3625 case DVDNAV_VTS_CHANGE: { |
13577 | 3626 mp_msg(MSGT_FIXME, MSGL_FIXME, MSGTR_DvdnavNavVTSChange); |
5489
5e6e08ff47d5
dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents:
5488
diff
changeset
|
3627 break; |
5e6e08ff47d5
dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents:
5488
diff
changeset
|
3628 } |
5e6e08ff47d5
dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents:
5488
diff
changeset
|
3629 case DVDNAV_CELL_CHANGE: { |
5e6e08ff47d5
dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents:
5488
diff
changeset
|
3630 dvdnav_cell_change_event_t *cell_change = (dvdnav_cell_change_event_t*)(dvdnav_event->details); |
5e6e08ff47d5
dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents:
5488
diff
changeset
|
3631 cell_playback_t * cell_playback = cell_change->new_cell; |
5e6e08ff47d5
dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents:
5488
diff
changeset
|
3632 |
13577 | 3633 mp_msg(MSGT_FIXME, MSGL_FIXME, MSGTR_DvdnavNavCellChange); |
5489
5e6e08ff47d5
dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents:
5488
diff
changeset
|
3634 osd_show_dvd_nav_highlight=0; /* screen changed, disable menu */ |
5e6e08ff47d5
dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents:
5488
diff
changeset
|
3635 /* |
5e6e08ff47d5
dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents:
5488
diff
changeset
|
3636 printf("new still time: %d\n",cell_playback->still_time); |
5e6e08ff47d5
dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents:
5488
diff
changeset
|
3637 printf("new cell_cmd_nr: %d\n",cell_playback->cell_cmd_nr); |
5e6e08ff47d5
dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents:
5488
diff
changeset
|
3638 printf("new playback_time: %02d:%02d:%02d.%02d\n", |
5e6e08ff47d5
dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents:
5488
diff
changeset
|
3639 cell_playback->playback_time.hour, |
5e6e08ff47d5
dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents:
5488
diff
changeset
|
3640 cell_playback->playback_time.minute, |
5e6e08ff47d5
dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents:
5488
diff
changeset
|
3641 cell_playback->playback_time.second, |
5e6e08ff47d5
dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents:
5488
diff
changeset
|
3642 cell_playback->playback_time.frame_u); |
5e6e08ff47d5
dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents:
5488
diff
changeset
|
3643 |
5e6e08ff47d5
dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents:
5488
diff
changeset
|
3644 */ |
5e6e08ff47d5
dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents:
5488
diff
changeset
|
3645 //rel_seek_secs=1; // not really: we can't seek, but it'll reset the muxer |
5e6e08ff47d5
dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents:
5488
diff
changeset
|
3646 //abs_seek_pos=0; |
5e6e08ff47d5
dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents:
5488
diff
changeset
|
3647 break; |
5e6e08ff47d5
dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents:
5488
diff
changeset
|
3648 } |
5e6e08ff47d5
dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents:
5488
diff
changeset
|
3649 case DVDNAV_NAV_PACKET: { |
5e6e08ff47d5
dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents:
5488
diff
changeset
|
3650 // printf("DVDNAV Event: Nav Packet\n"); |
5e6e08ff47d5
dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents:
5488
diff
changeset
|
3651 break; |
5e6e08ff47d5
dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents:
5488
diff
changeset
|
3652 } |
5e6e08ff47d5
dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents:
5488
diff
changeset
|
3653 case DVDNAV_SPU_CLUT_CHANGE: { |
5e6e08ff47d5
dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents:
5488
diff
changeset
|
3654 uint32_t * new_clut = (uint32_t *)(dvdnav_event->details); |
5e6e08ff47d5
dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents:
5488
diff
changeset
|
3655 |
13577 | 3656 mp_msg(MSGT_FIXME, MSGL_FIXME, MSGTR_DvdnavNavSpuClutChange); |
5489
5e6e08ff47d5
dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents:
5488
diff
changeset
|
3657 // send new palette to SPU decoder |
5e6e08ff47d5
dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents:
5488
diff
changeset
|
3658 if (vo_spudec) spudec_update_palette(vo_spudec,new_clut); |
5e6e08ff47d5
dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents:
5488
diff
changeset
|
3659 |
5e6e08ff47d5
dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents:
5488
diff
changeset
|
3660 break; |
5e6e08ff47d5
dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents:
5488
diff
changeset
|
3661 } |
5e6e08ff47d5
dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents:
5488
diff
changeset
|
3662 case DVDNAV_SEEK_DONE: { |
13577 | 3663 mp_msg(MSGT_FIXME, MSGL_FIXME, MSGTR_DvdnavNavSeekDone); |
5489
5e6e08ff47d5
dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents:
5488
diff
changeset
|
3664 break; |
5e6e08ff47d5
dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents:
5488
diff
changeset
|
3665 } |
5e6e08ff47d5
dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents:
5488
diff
changeset
|
3666 } |
5e6e08ff47d5
dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents:
5488
diff
changeset
|
3667 |
5e6e08ff47d5
dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents:
5488
diff
changeset
|
3668 // free the dvdnav event |
5e6e08ff47d5
dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents:
5488
diff
changeset
|
3669 free(dvdnav_event->details); |
5e6e08ff47d5
dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents:
5488
diff
changeset
|
3670 free(dvdnav_event); |
5e6e08ff47d5
dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents:
5488
diff
changeset
|
3671 cmd->args[0].v.v=NULL; |
5e6e08ff47d5
dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents:
5488
diff
changeset
|
3672 } |
5380
8a01cde9cf39
DVDnav support patch by David Holm and Kees Cook <mplayer@outflux.net>
arpi
parents:
5367
diff
changeset
|
3673 case MP_CMD_DVDNAV: { |
5489
5e6e08ff47d5
dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents:
5488
diff
changeset
|
3674 dvdnav_priv_t * dvdnav_priv=(dvdnav_priv_t*)stream->priv; |
5e6e08ff47d5
dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents:
5488
diff
changeset
|
3675 |
5627 | 3676 /* ignore these events if we're not in dvd_nav mode */ |
9752 | 3677 if (stream->type != STREAMTYPE_DVDNAV) break; |
5627 | 3678 |
5380
8a01cde9cf39
DVDnav support patch by David Holm and Kees Cook <mplayer@outflux.net>
arpi
parents:
5367
diff
changeset
|
3679 switch (cmd->args[0].v.i) { |
8a01cde9cf39
DVDnav support patch by David Holm and Kees Cook <mplayer@outflux.net>
arpi
parents:
5367
diff
changeset
|
3680 case MP_CMD_DVDNAV_UP: |
5489
5e6e08ff47d5
dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents:
5488
diff
changeset
|
3681 dvdnav_upper_button_select(dvdnav_priv->dvdnav); |
5380
8a01cde9cf39
DVDnav support patch by David Holm and Kees Cook <mplayer@outflux.net>
arpi
parents:
5367
diff
changeset
|
3682 break; |
8a01cde9cf39
DVDnav support patch by David Holm and Kees Cook <mplayer@outflux.net>
arpi
parents:
5367
diff
changeset
|
3683 case MP_CMD_DVDNAV_DOWN: |
5489
5e6e08ff47d5
dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents:
5488
diff
changeset
|
3684 dvdnav_lower_button_select(dvdnav_priv->dvdnav); |
5380
8a01cde9cf39
DVDnav support patch by David Holm and Kees Cook <mplayer@outflux.net>
arpi
parents:
5367
diff
changeset
|
3685 break; |
8a01cde9cf39
DVDnav support patch by David Holm and Kees Cook <mplayer@outflux.net>
arpi
parents:
5367
diff
changeset
|
3686 case MP_CMD_DVDNAV_LEFT: |
5489
5e6e08ff47d5
dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents:
5488
diff
changeset
|
3687 dvdnav_left_button_select(dvdnav_priv->dvdnav); |
5380
8a01cde9cf39
DVDnav support patch by David Holm and Kees Cook <mplayer@outflux.net>
arpi
parents:
5367
diff
changeset
|
3688 break; |
8a01cde9cf39
DVDnav support patch by David Holm and Kees Cook <mplayer@outflux.net>
arpi
parents:
5367
diff
changeset
|
3689 case MP_CMD_DVDNAV_RIGHT: |
5489
5e6e08ff47d5
dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents:
5488
diff
changeset
|
3690 dvdnav_right_button_select(dvdnav_priv->dvdnav); |
5380
8a01cde9cf39
DVDnav support patch by David Holm and Kees Cook <mplayer@outflux.net>
arpi
parents:
5367
diff
changeset
|
3691 break; |
8a01cde9cf39
DVDnav support patch by David Holm and Kees Cook <mplayer@outflux.net>
arpi
parents:
5367
diff
changeset
|
3692 case MP_CMD_DVDNAV_MENU: |
13577 | 3693 mp_msg(MSGT_FIXME, MSGL_FIXME, MSGTR_MenuCall); |
5489
5e6e08ff47d5
dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents:
5488
diff
changeset
|
3694 dvdnav_menu_call(dvdnav_priv->dvdnav,DVD_MENU_Root); |
5380
8a01cde9cf39
DVDnav support patch by David Holm and Kees Cook <mplayer@outflux.net>
arpi
parents:
5367
diff
changeset
|
3695 break; |
8a01cde9cf39
DVDnav support patch by David Holm and Kees Cook <mplayer@outflux.net>
arpi
parents:
5367
diff
changeset
|
3696 case MP_CMD_DVDNAV_SELECT: |
5489
5e6e08ff47d5
dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents:
5488
diff
changeset
|
3697 dvdnav_button_activate(dvdnav_priv->dvdnav); |
5380
8a01cde9cf39
DVDnav support patch by David Holm and Kees Cook <mplayer@outflux.net>
arpi
parents:
5367
diff
changeset
|
3698 break; |
8a01cde9cf39
DVDnav support patch by David Holm and Kees Cook <mplayer@outflux.net>
arpi
parents:
5367
diff
changeset
|
3699 default: |
8a01cde9cf39
DVDnav support patch by David Holm and Kees Cook <mplayer@outflux.net>
arpi
parents:
5367
diff
changeset
|
3700 mp_msg(MSGT_CPLAYER, MSGL_V, "Weird DVD Nav cmd %d\n",cmd->args[0].v.i); |
8a01cde9cf39
DVDnav support patch by David Holm and Kees Cook <mplayer@outflux.net>
arpi
parents:
5367
diff
changeset
|
3701 break; |
8a01cde9cf39
DVDnav support patch by David Holm and Kees Cook <mplayer@outflux.net>
arpi
parents:
5367
diff
changeset
|
3702 } |
8a01cde9cf39
DVDnav support patch by David Holm and Kees Cook <mplayer@outflux.net>
arpi
parents:
5367
diff
changeset
|
3703 break; |
8a01cde9cf39
DVDnav support patch by David Holm and Kees Cook <mplayer@outflux.net>
arpi
parents:
5367
diff
changeset
|
3704 } |
8a01cde9cf39
DVDnav support patch by David Holm and Kees Cook <mplayer@outflux.net>
arpi
parents:
5367
diff
changeset
|
3705 #endif |
4858 | 3706 default : { |
3707 #ifdef HAVE_NEW_GUI | |
3708 if ( ( use_gui )&&( cmd->id > MP_CMD_GUI_EVENTS ) ) guiGetEvent( guiIEvent,(char *)cmd->id ); | |
3709 else | |
3710 #endif | |
10397 | 3711 mp_msg(MSGT_CPLAYER, MSGL_V, "Received unknown cmd %s\n",cmd->name); |
4418
8141d2c399e4
A new configurable input system and joystick support for this system
albeu
parents:
4395
diff
changeset
|
3712 } |
4858 | 3713 } |
13991 | 3714 if (cmd->pausing) |
3715 osd_function = OSD_PAUSE; | |
4418
8141d2c399e4
A new configurable input system and joystick support for this system
albeu
parents:
4395
diff
changeset
|
3716 mp_cmd_free(cmd); |
8141d2c399e4
A new configurable input system and joystick support for this system
albeu
parents:
4395
diff
changeset
|
3717 } |
8141d2c399e4
A new configurable input system and joystick support for this system
albeu
parents:
4395
diff
changeset
|
3718 } |
7111 | 3719 |
651 | 3720 if (seek_to_sec) { |
937 | 3721 int a,b; float d; |
3722 | |
3723 if (sscanf(seek_to_sec, "%d:%d:%f", &a,&b,&d)==3) | |
3724 rel_seek_secs += 3600*a +60*b +d ; | |
3725 else if (sscanf(seek_to_sec, "%d:%f", &a, &d)==2) | |
3726 rel_seek_secs += 60*a +d; | |
3727 else if (sscanf(seek_to_sec, "%f", &d)==1) | |
3728 rel_seek_secs += d; | |
3729 | |
3730 seek_to_sec = NULL; | |
651 | 3731 } |
937 | 3732 |
2365 | 3733 /* Looping. */ |
3540 | 3734 if(eof==1 && loop_times>=0) { |
5655
117f34bb7097
Add correct loop option parsing in command line parser.
albeu
parents:
5651
diff
changeset
|
3735 int l = loop_times; |
117f34bb7097
Add correct loop option parsing in command line parser.
albeu
parents:
5651
diff
changeset
|
3736 play_tree_iter_step(playtree_iter,0,0); |
117f34bb7097
Add correct loop option parsing in command line parser.
albeu
parents:
5651
diff
changeset
|
3737 loop_times = l; |
3540 | 3738 mp_msg(MSGT_CPLAYER,MSGL_V,"loop_times = %d, eof = %d\n", loop_times,eof); |
2365 | 3739 |
3540 | 3740 if(loop_times>1) loop_times--; else |
3741 if(loop_times==1) loop_times=-1; | |
8198 | 3742 play_n_frames=play_n_frames_mf; |
2365 | 3743 eof=0; |
3540 | 3744 abs_seek_pos=3; rel_seek_secs=0; // seek to start of movie (0%) |
8784 | 3745 loop_seek = 1; |
2365 | 3746 } |
3747 | |
1627
eeaee1632340
absolute seek debugging with 1-8 keys (disabled by default)
arpi
parents:
1626
diff
changeset
|
3748 if(rel_seek_secs || abs_seek_pos){ |
1466 | 3749 current_module="seek"; |
1627
eeaee1632340
absolute seek debugging with 1-8 keys (disabled by default)
arpi
parents:
1626
diff
changeset
|
3750 if(demux_seek(demuxer,rel_seek_secs,abs_seek_pos)){ |
1405 | 3751 // success: |
4079 | 3752 /* FIXME there should be real seeking for vobsub */ |
8966 | 3753 if(sh_video) sh_video->pts=d_video->pts; |
4079 | 3754 if (vo_vobsub) |
11589 | 3755 //vobsub_reset(vo_vobsub); |
3756 vobsub_seek(vo_vobsub,sh_video->pts); | |
5942
fb3a76edddf1
100000l! it resets a/v buffers _after_ stream sync, dropping possible keyframe, and may causing a-v desync.. seems to fix mpg seek bug and avi desync bug
arpi
parents:
5929
diff
changeset
|
3757 #if 0 |
5836 | 3758 if(sh_video && d_video->packs == 0) |
3759 ds_fill_buffer(d_video); | |
1369
7a2f1881b776
a_frame, v_frame killed, using sh_audio/video->timer. has_audio not more used after initialization.
arpi
parents:
1353
diff
changeset
|
3760 if(sh_audio){ |
5836 | 3761 if(d_audio->packs == 0) |
3762 ds_fill_buffer(d_audio); | |
8027 | 3763 if(verbose>0){ |
1459
622c504f36ef
printf stuff moved seek.c->mplayer.c, resetting drop_frame_cnt after seek
arpi
parents:
1457
diff
changeset
|
3764 float a_pts=d_audio->pts; |
622c504f36ef
printf stuff moved seek.c->mplayer.c, resetting drop_frame_cnt after seek
arpi
parents:
1457
diff
changeset
|
3765 a_pts+=(ds_tell_pts(d_audio)-sh_audio->a_in_buffer_len)/(float)sh_audio->i_bps; |
1567 | 3766 mp_msg(MSGT_AVSYNC,MSGL_V,"SEEK: A: %5.3f V: %5.3f A-V: %5.3f \n",a_pts,d_video->pts,a_pts-d_video->pts); |
1459
622c504f36ef
printf stuff moved seek.c->mplayer.c, resetting drop_frame_cnt after seek
arpi
parents:
1457
diff
changeset
|
3767 } |
1567 | 3768 mp_msg(MSGT_AVSYNC,MSGL_STATUS,"A:%6.1f V:%6.1f A-V:%7.3f ct: ? \r",d_audio->pts,d_video->pts,0.0f); |
1459
622c504f36ef
printf stuff moved seek.c->mplayer.c, resetting drop_frame_cnt after seek
arpi
parents:
1457
diff
changeset
|
3769 } else { |
1567 | 3770 mp_msg(MSGT_AVSYNC,MSGL_STATUS,"A: --- V:%6.1f \r",d_video->pts); |
1459
622c504f36ef
printf stuff moved seek.c->mplayer.c, resetting drop_frame_cnt after seek
arpi
parents:
1457
diff
changeset
|
3771 } |
5942
fb3a76edddf1
100000l! it resets a/v buffers _after_ stream sync, dropping possible keyframe, and may causing a-v desync.. seems to fix mpg seek bug and avi desync bug
arpi
parents:
5929
diff
changeset
|
3772 #endif |
1459
622c504f36ef
printf stuff moved seek.c->mplayer.c, resetting drop_frame_cnt after seek
arpi
parents:
1457
diff
changeset
|
3773 fflush(stdout); |
622c504f36ef
printf stuff moved seek.c->mplayer.c, resetting drop_frame_cnt after seek
arpi
parents:
1457
diff
changeset
|
3774 |
4593
3769ccb8da8b
libvo's query_ stuff replaced by new control() - patch by David Holm
arpi
parents:
4587
diff
changeset
|
3775 if(sh_video){ |
3769ccb8da8b
libvo's query_ stuff replaced by new control() - patch by David Holm
arpi
parents:
4587
diff
changeset
|
3776 current_module="seek_video_reset"; |
11977
efb37725d616
flushing stuff after seeking (finally we can view MPEG without thouse blocks after seeking with -vc ffmpeg12)
michael
parents:
11936
diff
changeset
|
3777 resync_video_stream(sh_video); |
5511 | 3778 if(vo_config_count) video_out->control(VOCTRL_RESET,NULL); |
4593
3769ccb8da8b
libvo's query_ stuff replaced by new control() - patch by David Holm
arpi
parents:
4587
diff
changeset
|
3779 } |
3769ccb8da8b
libvo's query_ stuff replaced by new control() - patch by David Holm
arpi
parents:
4587
diff
changeset
|
3780 |
1459
622c504f36ef
printf stuff moved seek.c->mplayer.c, resetting drop_frame_cnt after seek
arpi
parents:
1457
diff
changeset
|
3781 if(sh_audio){ |
1466 | 3782 current_module="seek_audio_reset"; |
1334 | 3783 audio_out->reset(); // stop audio, throwing away buffered data |
1 | 3784 } |
1422 | 3785 #ifdef USE_OSD |
1334 | 3786 // Set OSD: |
8784 | 3787 if(osd_level && !loop_seek){ |
8531
1aa2c9b460af
Merged EDL 0.5 patch - it's something like Quicktime's edit lists.
arpi
parents:
8494
diff
changeset
|
3788 #ifdef USE_EDL |
1aa2c9b460af
Merged EDL 0.5 patch - it's something like Quicktime's edit lists.
arpi
parents:
8494
diff
changeset
|
3789 if( !edl_decision ) { |
1aa2c9b460af
Merged EDL 0.5 patch - it's something like Quicktime's edit lists.
arpi
parents:
8494
diff
changeset
|
3790 #else |
1aa2c9b460af
Merged EDL 0.5 patch - it's something like Quicktime's edit lists.
arpi
parents:
8494
diff
changeset
|
3791 if( 1 ) { // Let the compiler optimize this out |
1aa2c9b460af
Merged EDL 0.5 patch - it's something like Quicktime's edit lists.
arpi
parents:
8494
diff
changeset
|
3792 #endif |
14197
2ae224195625
Use demuxer_get_percent_pos for the OSD position bar
reimar
parents:
14188
diff
changeset
|
3793 if (sh_video) { |
8531
1aa2c9b460af
Merged EDL 0.5 patch - it's something like Quicktime's edit lists.
arpi
parents:
8494
diff
changeset
|
3794 osd_visible=sh_video->fps; // 1 sec |
1aa2c9b460af
Merged EDL 0.5 patch - it's something like Quicktime's edit lists.
arpi
parents:
8494
diff
changeset
|
3795 vo_osd_progbar_type=0; |
14197
2ae224195625
Use demuxer_get_percent_pos for the OSD position bar
reimar
parents:
14188
diff
changeset
|
3796 vo_osd_progbar_value=demuxer_get_percent_pos(demuxer) * 256 / 100; |
8531
1aa2c9b460af
Merged EDL 0.5 patch - it's something like Quicktime's edit lists.
arpi
parents:
8494
diff
changeset
|
3797 vo_osd_changed(OSDTYPE_PROGBAR); |
1aa2c9b460af
Merged EDL 0.5 patch - it's something like Quicktime's edit lists.
arpi
parents:
8494
diff
changeset
|
3798 } |
1727 | 3799 } |
1334 | 3800 } |
1422 | 3801 #endif |
4587
886bf5274992
Audio only support. Include a fix in the asf demuxer opening.
albeu
parents:
4552
diff
changeset
|
3802 if(sh_video) { |
886bf5274992
Audio only support. Include a fix in the asf demuxer opening.
albeu
parents:
4552
diff
changeset
|
3803 c_total=0; |
886bf5274992
Audio only support. Include a fix in the asf demuxer opening.
albeu
parents:
4552
diff
changeset
|
3804 max_pts_correction=0.1; |
886bf5274992
Audio only support. Include a fix in the asf demuxer opening.
albeu
parents:
4552
diff
changeset
|
3805 osd_visible=sh_video->fps; // to rewert to PLAY pointer after 1 sec |
886bf5274992
Audio only support. Include a fix in the asf demuxer opening.
albeu
parents:
4552
diff
changeset
|
3806 audio_time_usage=0; video_time_usage=0; vout_time_usage=0; |
886bf5274992
Audio only support. Include a fix in the asf demuxer opening.
albeu
parents:
4552
diff
changeset
|
3807 drop_frame_cnt=0; |
886bf5274992
Audio only support. Include a fix in the asf demuxer opening.
albeu
parents:
4552
diff
changeset
|
3808 too_slow_frame_cnt=0; |
886bf5274992
Audio only support. Include a fix in the asf demuxer opening.
albeu
parents:
4552
diff
changeset
|
3809 too_fast_frame_cnt=0; |
3744 | 3810 |
5488
3f183ca22747
fixed SPU pts, it's 1024/90000 based instead of 1/100
arpi
parents:
5463
diff
changeset
|
3811 if(vo_spudec) spudec_reset(vo_spudec); |
4587
886bf5274992
Audio only support. Include a fix in the asf demuxer opening.
albeu
parents:
4552
diff
changeset
|
3812 } |
1 | 3813 } |
8531
1aa2c9b460af
Merged EDL 0.5 patch - it's something like Quicktime's edit lists.
arpi
parents:
8494
diff
changeset
|
3814 #ifdef USE_EDL |
13168 | 3815 /* |
13358
567875b88aab
Hardcoded EDL messages moved to help_mp-en.h, Doxygen comments added, patch
diego
parents:
13353
diff
changeset
|
3816 * We saw a seek, have to rewind the EDL operations stack |
567875b88aab
Hardcoded EDL messages moved to help_mp-en.h, Doxygen comments added, patch
diego
parents:
13353
diff
changeset
|
3817 * and find the next EDL action to take care of. |
13168 | 3818 */ |
3819 | |
13882
8a928d5b42b8
Replaces edl_mute_count with togle making code more understandable, other trivial list suggested changes too, Patch by Oded Shimon
reynaldo
parents:
13868
diff
changeset
|
3820 edl_muted = 0; |
13168 | 3821 next_edl_record = edl_records; |
3822 | |
3823 while (next_edl_record) | |
3824 { | |
13358
567875b88aab
Hardcoded EDL messages moved to help_mp-en.h, Doxygen comments added, patch
diego
parents:
13353
diff
changeset
|
3825 /* Trying to remember if we need to mute/unmute first; |
567875b88aab
Hardcoded EDL messages moved to help_mp-en.h, Doxygen comments added, patch
diego
parents:
13353
diff
changeset
|
3826 * prior EDL implementation lacks this. |
13168 | 3827 */ |
3828 | |
3829 if (next_edl_record->start_sec >= sh_video->pts) | |
3830 break; | |
13867 | 3831 |
13882
8a928d5b42b8
Replaces edl_mute_count with togle making code more understandable, other trivial list suggested changes too, Patch by Oded Shimon
reynaldo
parents:
13868
diff
changeset
|
3832 if (next_edl_record->action == EDL_MUTE) edl_muted = !edl_muted; |
13168 | 3833 next_edl_record = next_edl_record->next; |
3834 | |
3835 } | |
13882
8a928d5b42b8
Replaces edl_mute_count with togle making code more understandable, other trivial list suggested changes too, Patch by Oded Shimon
reynaldo
parents:
13868
diff
changeset
|
3836 if ((user_muted | edl_muted) != mixer.muted) mixer_mute(&mixer); |
8531
1aa2c9b460af
Merged EDL 0.5 patch - it's something like Quicktime's edit lists.
arpi
parents:
8494
diff
changeset
|
3837 #endif |
1405 | 3838 rel_seek_secs=0; |
1627
eeaee1632340
absolute seek debugging with 1-8 keys (disabled by default)
arpi
parents:
1626
diff
changeset
|
3839 abs_seek_pos=0; |
5929
9e7d54e7be58
- frame_time delayed one frame, as it's really duration of current frame,
arpi
parents:
5927
diff
changeset
|
3840 frame_time_remaining=0; |
1466 | 3841 current_module=NULL; |
8784 | 3842 loop_seek=0; |
1466 | 3843 } |
3844 | |
1723
5e4214a7540e
GUI stuff. now seeking works, and xmga renders to video window
arpi
parents:
1709
diff
changeset
|
3845 #ifdef HAVE_NEW_GUI |
5e4214a7540e
GUI stuff. now seeking works, and xmga renders to video window
arpi
parents:
1709
diff
changeset
|
3846 if(use_gui){ |
5789 | 3847 guiEventHandling(); |
7751 | 3848 if(demuxer->file_format==DEMUXER_TYPE_AVI && sh_video && sh_video->video.dwLength>2){ |
1735 | 3849 // get pos from frame number / total frames |
4818
3473ca9ef158
new gui interface, and gtk moved into mplayer process. fork ... bleh :)
pontscho
parents:
4807
diff
changeset
|
3850 guiIntfStruct.Position=(float)d_video->pack_no*100.0f/sh_video->video.dwLength; |
1735 | 3851 } else { |
6914 | 3852 off_t len = ( demuxer->movi_end - demuxer->movi_start ); |
3853 off_t pos = ( demuxer->file_format == DEMUXER_TYPE_AUDIO?stream->pos:demuxer->filepos ); | |
3854 guiIntfStruct.Position=(len <= 0? 0.0f : ( pos - demuxer->movi_start ) * 100.0f / len ); | |
1735 | 3855 } |
8966 | 3856 if ( sh_video ) guiIntfStruct.TimeSec=sh_video->pts; |
8056
324b6e5387be
A-V sync cleanup: sh_audio->timer replaced by sh_audio->delay, it contains
arpi
parents:
8030
diff
changeset
|
3857 else if ( sh_audio ) guiIntfStruct.TimeSec=sh_audio->delay; |
8305
4c23944315d6
- add R«ädiger Kuhlmann's <mplayer-list-UGa6JdjLujS2@ruediger-kuhlmann.de> patch
pontscho
parents:
8254
diff
changeset
|
3858 guiIntfStruct.LengthInSec=demuxer_get_time_length(demuxer); |
6619
f554e7271587
fix volume handling ( step 2 ) -- add balance support and some code cleanup and fix
pontscho
parents:
6590
diff
changeset
|
3859 guiGetEvent( guiReDraw,NULL ); |
6903 | 3860 guiGetEvent( guiSetVolume,NULL ); |
4818
3473ca9ef158
new gui interface, and gtk moved into mplayer process. fork ... bleh :)
pontscho
parents:
4807
diff
changeset
|
3861 if(guiIntfStruct.Playing==0) break; // STOP |
3473ca9ef158
new gui interface, and gtk moved into mplayer process. fork ... bleh :)
pontscho
parents:
4807
diff
changeset
|
3862 if(guiIntfStruct.Playing==2) osd_function=OSD_PAUSE; |
8423 | 3863 if ( guiIntfStruct.DiskChanged || guiIntfStruct.NewPlay ) goto goto_next_file; |
3054 | 3864 #ifdef USE_DVDREAD |
3865 if ( stream->type == STREAMTYPE_DVD ) | |
3866 { | |
3867 dvd_priv_t * dvdp = stream->priv; | |
7854 | 3868 guiIntfStruct.DVD.current_chapter=dvd_chapter_from_cell(dvdp,guiIntfStruct.DVD.current_title-1, dvdp->cur_cell)+1; |
3054 | 3869 } |
3870 #endif | |
1723
5e4214a7540e
GUI stuff. now seeking works, and xmga renders to video window
arpi
parents:
1709
diff
changeset
|
3871 } |
5e4214a7540e
GUI stuff. now seeking works, and xmga renders to video window
arpi
parents:
1709
diff
changeset
|
3872 #endif |
5e4214a7540e
GUI stuff. now seeking works, and xmga renders to video window
arpi
parents:
1709
diff
changeset
|
3873 |
5e4214a7540e
GUI stuff. now seeking works, and xmga renders to video window
arpi
parents:
1709
diff
changeset
|
3874 |
220 | 3875 //================= Update OSD ==================== |
1422 | 3876 #ifdef USE_OSD |
10596
14695e4f37fc
"when I run "mplayer -slave <audiofile> " then, while playing, I send the
albeu
parents:
10594
diff
changeset
|
3877 if(osd_level>=1 && sh_video){ |
8966 | 3878 int pts=sh_video->pts; |
8800 | 3879 char osd_text_tmp[64]; |
595 | 3880 if(pts==osd_last_pts-1) ++pts; else osd_last_pts=pts; |
371 | 3881 vo_osd_text=osd_text_buffer; |
5489
5e6e08ff47d5
dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents:
5488
diff
changeset
|
3882 #ifdef USE_DVDNAV |
5e6e08ff47d5
dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents:
5488
diff
changeset
|
3883 if (osd_show_dvd_nav_delay) { |
8800 | 3884 snprintf(osd_text_tmp, 63, "DVDNAV: %s", dvd_nav_text); |
5489
5e6e08ff47d5
dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents:
5488
diff
changeset
|
3885 osd_show_dvd_nav_delay--; |
5e6e08ff47d5
dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents:
5488
diff
changeset
|
3886 } else |
5e6e08ff47d5
dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents:
5488
diff
changeset
|
3887 #endif |
8627
14ab71b47a58
user friendly channel tuning + 10L fix in tvi_v4l (by Stephane Jourdois)
henry
parents:
8619
diff
changeset
|
3888 #ifdef USE_TV |
14ab71b47a58
user friendly channel tuning + 10L fix in tvi_v4l (by Stephane Jourdois)
henry
parents:
8619
diff
changeset
|
3889 if (osd_show_tv_channel && tv_channel_list) { |
8800 | 3890 snprintf(osd_text_tmp, 63, "Channel: %s", tv_channel_current->name); |
8627
14ab71b47a58
user friendly channel tuning + 10L fix in tvi_v4l (by Stephane Jourdois)
henry
parents:
8619
diff
changeset
|
3891 osd_show_tv_channel--; |
14ab71b47a58
user friendly channel tuning + 10L fix in tvi_v4l (by Stephane Jourdois)
henry
parents:
8619
diff
changeset
|
3892 } else |
14ab71b47a58
user friendly channel tuning + 10L fix in tvi_v4l (by Stephane Jourdois)
henry
parents:
8619
diff
changeset
|
3893 #endif |
10116
add63fea61ac
new slave mode command to show text via osd, patch by Lars Gemeinhardt <lars.gemeinhardt at searchbroker.de> (reviewed by albeu)
faust3
parents:
10053
diff
changeset
|
3894 if (osd_show_text) { |
add63fea61ac
new slave mode command to show text via osd, patch by Lars Gemeinhardt <lars.gemeinhardt at searchbroker.de> (reviewed by albeu)
faust3
parents:
10053
diff
changeset
|
3895 snprintf(osd_text_tmp, 63, "%s", osd_show_text_buffer); |
add63fea61ac
new slave mode command to show text via osd, patch by Lars Gemeinhardt <lars.gemeinhardt at searchbroker.de> (reviewed by albeu)
faust3
parents:
10053
diff
changeset
|
3896 osd_show_text--; |
add63fea61ac
new slave mode command to show text via osd, patch by Lars Gemeinhardt <lars.gemeinhardt at searchbroker.de> (reviewed by albeu)
faust3
parents:
10053
diff
changeset
|
3897 } else |
7628
d6608342591d
This patch adds the functionality to disable/enable subtitles while playing
arpi
parents:
7621
diff
changeset
|
3898 if (osd_show_sub_visibility) { |
8800 | 3899 snprintf(osd_text_tmp, 63, "Subtitles: %sabled", sub_visibility?"en":"dis"); |
7628
d6608342591d
This patch adds the functionality to disable/enable subtitles while playing
arpi
parents:
7621
diff
changeset
|
3900 osd_show_sub_visibility--; |
d6608342591d
This patch adds the functionality to disable/enable subtitles while playing
arpi
parents:
7621
diff
changeset
|
3901 } else |
7780
9806d65986e4
Mplayer can switch between subtitles of different languages during
kmkaplan
parents:
7751
diff
changeset
|
3902 if (osd_show_vobsub_changed) { |
13089 | 3903 if (vo_vobsub && vobsub_id >= 0) { |
3904 const char *language = "none"; | |
7780
9806d65986e4
Mplayer can switch between subtitles of different languages during
kmkaplan
parents:
7751
diff
changeset
|
3905 language = vobsub_get_id(vo_vobsub, (unsigned int) vobsub_id); |
8800 | 3906 snprintf(osd_text_tmp, 63, "Subtitles: (%d) %s", vobsub_id, language ? language : "unknown"); |
13089 | 3907 } |
13502 | 3908 #ifdef HAVE_OGGVORBIS |
13089 | 3909 if (d_dvdsub && demuxer->type == DEMUXER_TYPE_OGG) { |
3910 if (dvdsub_id < 0) | |
3911 snprintf(osd_text_tmp, 63, "Subtitles: (off)"); | |
13502 | 3912 else { |
3913 char *lang = demux_ogg_sub_lang(demuxer, dvdsub_id); | |
3914 if (!lang) lang = "unknown"; | |
3915 snprintf(osd_text_tmp, 63, "Subtitles: (%d) %s", dvdsub_id, lang); | |
3916 } | |
13089 | 3917 } |
13502 | 3918 #endif |
13116 | 3919 #ifdef USE_DVDREAD |
13129
cfce549da2f0
Display the language code for subtitles from Matroska files.
mosu
parents:
13127
diff
changeset
|
3920 if (vo_spudec && (demuxer->type != DEMUXER_TYPE_MATROSKA)) { |
13089 | 3921 char lang[5] = "none"; |
3922 int code = 0; | |
3923 if (dvdsub_id >= 0) code = dvd_lang_from_sid(stream, dvdsub_id); | |
3924 if (code) { | |
3925 lang[0] = code >> 8; | |
3926 lang[1] = code; | |
3927 lang[2] = 0; | |
3928 } | |
3929 snprintf(osd_text_tmp, 63, "Subtitles: (%d) %s", dvdsub_id, lang); | |
3930 } | |
13116 | 3931 #endif |
13129
cfce549da2f0
Display the language code for subtitles from Matroska files.
mosu
parents:
13127
diff
changeset
|
3932 #ifdef HAVE_MATROSKA |
cfce549da2f0
Display the language code for subtitles from Matroska files.
mosu
parents:
13127
diff
changeset
|
3933 if (demuxer->type == DEMUXER_TYPE_MATROSKA) { |
cfce549da2f0
Display the language code for subtitles from Matroska files.
mosu
parents:
13127
diff
changeset
|
3934 char lang[10] = "unknown"; |
cfce549da2f0
Display the language code for subtitles from Matroska files.
mosu
parents:
13127
diff
changeset
|
3935 if (dvdsub_id >= 0) { |
cfce549da2f0
Display the language code for subtitles from Matroska files.
mosu
parents:
13127
diff
changeset
|
3936 demux_mkv_get_sub_lang(demuxer, dvdsub_id, lang, 9); |
cfce549da2f0
Display the language code for subtitles from Matroska files.
mosu
parents:
13127
diff
changeset
|
3937 lang[9] = 0; |
cfce549da2f0
Display the language code for subtitles from Matroska files.
mosu
parents:
13127
diff
changeset
|
3938 } else |
cfce549da2f0
Display the language code for subtitles from Matroska files.
mosu
parents:
13127
diff
changeset
|
3939 strcpy(lang, "off"); |
cfce549da2f0
Display the language code for subtitles from Matroska files.
mosu
parents:
13127
diff
changeset
|
3940 snprintf(osd_text_tmp, 63, "Subtitles: (%d) %s", dvdsub_id, lang); |
cfce549da2f0
Display the language code for subtitles from Matroska files.
mosu
parents:
13127
diff
changeset
|
3941 } |
cfce549da2f0
Display the language code for subtitles from Matroska files.
mosu
parents:
13127
diff
changeset
|
3942 #endif |
7780
9806d65986e4
Mplayer can switch between subtitles of different languages during
kmkaplan
parents:
7751
diff
changeset
|
3943 osd_show_vobsub_changed--; |
9806d65986e4
Mplayer can switch between subtitles of different languages during
kmkaplan
parents:
7751
diff
changeset
|
3944 } else |
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9831
diff
changeset
|
3945 #ifdef USE_SUB |
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9831
diff
changeset
|
3946 if (osd_show_sub_changed) { |
9875
6f36703cdd2a
The person who checked in the previous patch accidentally put a declaration
rsf
parents:
9870
diff
changeset
|
3947 char *tmp2; |
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9831
diff
changeset
|
3948 tmp = subdata->filename; |
10211
4bc481804519
warning fixes by Dominik Mierzejewski <dominik@rangers.eu.org>
alex
parents:
10167
diff
changeset
|
3949 if ((tmp2 = strrchr(tmp, '/'))) { |
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9831
diff
changeset
|
3950 tmp = tmp2+1; |
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9831
diff
changeset
|
3951 } |
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9831
diff
changeset
|
3952 snprintf(osd_text_tmp, 63, "Sub: (%d) %s%s", |
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9831
diff
changeset
|
3953 set_of_sub_pos + 1, |
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9831
diff
changeset
|
3954 strlen(tmp) < 20 ? "" : "...", |
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9831
diff
changeset
|
3955 strlen(tmp) < 20 ? tmp : tmp+strlen(tmp)-19); |
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9831
diff
changeset
|
3956 osd_show_sub_changed--; |
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9831
diff
changeset
|
3957 } else |
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9831
diff
changeset
|
3958 #endif |
3234
d1e891c1e548
dusplay sub_delay patch by Evgeny Chukreev <codedj@echo.ru>
arpi
parents:
3201
diff
changeset
|
3959 if (osd_show_sub_delay) { |
8800 | 3960 snprintf(osd_text_tmp, 63, "Sub delay: %d ms", ROUND(sub_delay*1000)); |
3234
d1e891c1e548
dusplay sub_delay patch by Evgeny Chukreev <codedj@echo.ru>
arpi
parents:
3201
diff
changeset
|
3961 osd_show_sub_delay--; |
d1e891c1e548
dusplay sub_delay patch by Evgeny Chukreev <codedj@echo.ru>
arpi
parents:
3201
diff
changeset
|
3962 } else |
8366
3e3b30d16719
With this patch the text 'Sub position: x/100' is displayed
arpi
parents:
8365
diff
changeset
|
3963 if (osd_show_sub_pos) { |
8800 | 3964 snprintf(osd_text_tmp, 63, "Sub position: %d/100", sub_pos); |
8366
3e3b30d16719
With this patch the text 'Sub position: x/100' is displayed
arpi
parents:
8365
diff
changeset
|
3965 osd_show_sub_pos--; |
3e3b30d16719
With this patch the text 'Sub position: x/100' is displayed
arpi
parents:
8365
diff
changeset
|
3966 } else |
8534
922ce27eb683
This patch adds support for vertical subtitle alignment
arpi
parents:
8531
diff
changeset
|
3967 if (osd_show_sub_alignment) { |
8800 | 3968 snprintf(osd_text_tmp, 63, "Sub alignment: %s", |
8534
922ce27eb683
This patch adds support for vertical subtitle alignment
arpi
parents:
8531
diff
changeset
|
3969 (sub_alignment == 2 ? "bottom" : |
922ce27eb683
This patch adds support for vertical subtitle alignment
arpi
parents:
8531
diff
changeset
|
3970 (sub_alignment == 1 ? "center" : "top"))); |
922ce27eb683
This patch adds support for vertical subtitle alignment
arpi
parents:
8531
diff
changeset
|
3971 osd_show_sub_alignment--; |
922ce27eb683
This patch adds support for vertical subtitle alignment
arpi
parents:
8531
diff
changeset
|
3972 } else |
3783 | 3973 if (osd_show_av_delay) { |
8800 | 3974 snprintf(osd_text_tmp, 63, "A-V delay: %d ms", ROUND(audio_delay*1000)); |
3783 | 3975 osd_show_av_delay--; |
13710 | 3976 } else if (osd_show_speed) { |
3977 snprintf(osd_text_tmp, 63, "Speed: x %6.2f", playback_speed); | |
3978 osd_show_speed--; | |
11542 | 3979 } else if (osd_show_ontop) { |
3980 snprintf(osd_text_tmp, 63, "Stay on top: %sabled", vo_ontop?"en":"dis"); | |
3981 osd_show_ontop--; | |
13091 | 3982 } else if (osd_show_rootwin) { |
3983 snprintf(osd_text_tmp, 63, "Rootwin: %sabled", vo_rootwin?"en":"dis"); | |
3984 osd_show_rootwin--; | |
11936 | 3985 } else if (osd_show_framedropping) { |
3986 snprintf(osd_text_tmp, 63, "Framedropping: %s", | |
3987 (frame_dropping == 1 ? "on" : | |
3988 (frame_dropping == 2 ? "hard" : "off"))); | |
3989 osd_show_framedropping--; | |
8612
a61d1b326beb
It shows not just the progressbar, but progressbar /and/ percentage
arpi
parents:
8606
diff
changeset
|
3990 } else if(osd_level>=2) { |
a61d1b326beb
It shows not just the progressbar, but progressbar /and/ percentage
arpi
parents:
8606
diff
changeset
|
3991 int len = demuxer_get_time_length(demuxer); |
a61d1b326beb
It shows not just the progressbar, but progressbar /and/ percentage
arpi
parents:
8606
diff
changeset
|
3992 int percentage = -1; |
8800 | 3993 char percentage_text[10]; |
8612
a61d1b326beb
It shows not just the progressbar, but progressbar /and/ percentage
arpi
parents:
8606
diff
changeset
|
3994 if (osd_show_percentage) { |
a61d1b326beb
It shows not just the progressbar, but progressbar /and/ percentage
arpi
parents:
8606
diff
changeset
|
3995 percentage = demuxer_get_percent_pos(demuxer); |
a61d1b326beb
It shows not just the progressbar, but progressbar /and/ percentage
arpi
parents:
8606
diff
changeset
|
3996 osd_show_percentage--; |
a61d1b326beb
It shows not just the progressbar, but progressbar /and/ percentage
arpi
parents:
8606
diff
changeset
|
3997 } |
a61d1b326beb
It shows not just the progressbar, but progressbar /and/ percentage
arpi
parents:
8606
diff
changeset
|
3998 if (percentage >= 0) |
8800 | 3999 snprintf(percentage_text, 9, " (%d%%)", percentage); |
8619 | 4000 else |
4001 percentage_text[0] = 0; | |
8612
a61d1b326beb
It shows not just the progressbar, but progressbar /and/ percentage
arpi
parents:
8606
diff
changeset
|
4002 if (osd_level == 3) |
8800 | 4003 snprintf(osd_text_tmp, 63, "%c %02d:%02d:%02d / %02d:%02d:%02d%s",osd_function,pts/3600,(pts/60)%60,pts%60,len/3600,(len/60)%60,len%60,percentage_text); |
8612
a61d1b326beb
It shows not just the progressbar, but progressbar /and/ percentage
arpi
parents:
8606
diff
changeset
|
4004 else |
8800 | 4005 snprintf(osd_text_tmp, 63, "%c %02d:%02d:%02d%s",osd_function,pts/3600,(pts/60)%60,pts%60,percentage_text); |
8612
a61d1b326beb
It shows not just the progressbar, but progressbar /and/ percentage
arpi
parents:
8606
diff
changeset
|
4006 } else osd_text_tmp[0]=0; |
4807
156482788caf
osd outside movie support for vo_sdl, patch by Fredrik Kuivinen
atmos4
parents:
4798
diff
changeset
|
4007 |
156482788caf
osd outside movie support for vo_sdl, patch by Fredrik Kuivinen
atmos4
parents:
4798
diff
changeset
|
4008 if(strcmp(vo_osd_text, osd_text_tmp)) { |
8800 | 4009 strncpy(vo_osd_text, osd_text_tmp, 63); |
5638
86663f1b9b00
new osd code, use osd objs to follow changes and do minimal updates
arpi
parents:
5627
diff
changeset
|
4010 vo_osd_changed(OSDTYPE_OSD); |
4807
156482788caf
osd outside movie support for vo_sdl, patch by Fredrik Kuivinen
atmos4
parents:
4798
diff
changeset
|
4011 } |
371 | 4012 } else { |
4807
156482788caf
osd outside movie support for vo_sdl, patch by Fredrik Kuivinen
atmos4
parents:
4798
diff
changeset
|
4013 if(vo_osd_text) { |
371 | 4014 vo_osd_text=NULL; |
5638
86663f1b9b00
new osd code, use osd objs to follow changes and do minimal updates
arpi
parents:
5627
diff
changeset
|
4015 vo_osd_changed(OSDTYPE_OSD); |
4807
156482788caf
osd outside movie support for vo_sdl, patch by Fredrik Kuivinen
atmos4
parents:
4798
diff
changeset
|
4016 } |
371 | 4017 } |
220 | 4018 // for(i=1;i<=11;i++) osd_text_buffer[10+i]=i;osd_text_buffer[10+i]=0; |
371 | 4019 // vo_osd_text=osd_text_buffer; |
1422 | 4020 #endif |
458
49b0474b2e26
I really hope that you will learn how to use cvs, sooner or later...
arpi_esp
parents:
452
diff
changeset
|
4021 |
1422 | 4022 #ifdef USE_SUB |
258 | 4023 // find sub |
14644
36d53262f626
avoid null pointer dereference with .ssa subtitles when the video codec is missing patch by Philip Chong <pchong at ic.eecs.berkeley.edu>
faust3
parents:
14610
diff
changeset
|
4024 if(subdata && sh_video && sh_video->pts>0){ |
8966 | 4025 float pts=sh_video->pts; |
398 | 4026 if(sub_fps==0) sub_fps=sh_video->fps; |
482 | 4027 current_module="find_sub"; |
3274
ac7ded58b6df
mpeg subtitle flickering patch by Evgeny Chukreev <codedj@echo.ru>
arpi
parents:
3257
diff
changeset
|
4028 if (pts > sub_last_pts || pts < sub_last_pts-1.0 ) { |
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9831
diff
changeset
|
4029 find_sub(subdata, (pts+sub_delay) * |
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9831
diff
changeset
|
4030 (subdata->sub_uses_time ? 100. : sub_fps)); |
14684 | 4031 if (vo_sub) vo_sub_last = vo_sub; |
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9831
diff
changeset
|
4032 // FIXME! frame counter... |
3274
ac7ded58b6df
mpeg subtitle flickering patch by Evgeny Chukreev <codedj@echo.ru>
arpi
parents:
3257
diff
changeset
|
4033 sub_last_pts = pts; |
ac7ded58b6df
mpeg subtitle flickering patch by Evgeny Chukreev <codedj@echo.ru>
arpi
parents:
3257
diff
changeset
|
4034 } |
482 | 4035 current_module=NULL; |
258 | 4036 } |
1422 | 4037 #endif |
9695 | 4038 |
9831 | 4039 #ifdef HAVE_X11 |
9695 | 4040 if (stop_xscreensaver && sh_video) { |
4041 current_module="stop_xscreensaver"; | |
11999 | 4042 xscreensaver_heartbeat(); |
9695 | 4043 current_module=NULL; |
4044 } | |
9831 | 4045 #endif |
554 | 4046 |
6110 | 4047 // DVD sub: |
4048 if(vo_config_count && vo_spudec) { | |
4049 unsigned char* packet=NULL; | |
10240 | 4050 int len,timestamp; |
10216 | 4051 current_module="spudec"; |
4052 spudec_heartbeat(vo_spudec,90000*sh_video->timer); | |
6110 | 4053 // Get a sub packet from the dvd or a vobsub and make a timestamp relative to sh_video->timer |
10240 | 4054 while(1) { |
6110 | 4055 // Vobsub |
4056 len = 0; | |
4057 if(vo_vobsub) { | |
8966 | 4058 if(sh_video->pts+sub_delay>=0) { |
6110 | 4059 // The + next_frame_time is there because we'll display the sub at the next frame |
8966 | 4060 len = vobsub_get_packet(vo_vobsub,sh_video->pts+sub_delay+next_frame_time,(void**)&packet,×tamp); |
6110 | 4061 if(len > 0) { |
8966 | 4062 timestamp -= (sh_video->pts + sub_delay - sh_video->timer)*90000; |
10718 | 4063 mp_dbg(MSGT_CPLAYER,MSGL_V,"\rVOB sub: len=%d v_pts=%5.3f v_timer=%5.3f sub=%5.3f ts=%d \n",len,sh_video->pts,sh_video->timer,timestamp / 90000.0,timestamp); |
6110 | 4064 } |
4065 } | |
4066 } else { | |
4067 // DVD sub | |
4068 len = ds_get_packet_sub(d_dvdsub,(unsigned char**)&packet); | |
4069 if(len > 0) { | |
10691 | 4070 float x = d_dvdsub->pts - sh_video->pts; |
4071 if (x < -10 || x > 10) // prevent missing subs on pts reset | |
10557 | 4072 timestamp = 90000*(sh_video->timer + d_dvdsub->pts + sub_delay - sh_video->pts); |
4073 else timestamp = 90000*(sh_video->timer + sub_delay); | |
8966 | 4074 mp_dbg(MSGT_CPLAYER,MSGL_V,"\rDVD sub: len=%d v_pts=%5.3f s_pts=%5.3f ts=%d \n",len,sh_video->pts,d_dvdsub->pts,timestamp); |
6110 | 4075 } |
4076 } | |
10240 | 4077 if(len<=0 || !packet) break; |
6204 | 4078 if(timestamp < 0) timestamp = 0; |
11331
7edd5436337d
Do not display VobSubs whose timecodes are < 0 which would make all VobSubs appear from the start on upon seeking. Patch by "Reder, Uwe" <Uwe.Reder@3SOFT.de>.
mosu
parents:
11254
diff
changeset
|
4079 else spudec_assemble(vo_spudec,packet,len,timestamp); |
554 | 4080 } |
4081 | |
6190
bd6748605681
Bounding box and partial update patch for vob/dvdsub by Hephooey.
atmos4
parents:
6185
diff
changeset
|
4082 /* detect wether the sub has changed or not */ |
bd6748605681
Bounding box and partial update patch for vob/dvdsub by Hephooey.
atmos4
parents:
6185
diff
changeset
|
4083 if(spudec_changed(vo_spudec)) |
bd6748605681
Bounding box and partial update patch for vob/dvdsub by Hephooey.
atmos4
parents:
6185
diff
changeset
|
4084 vo_osd_changed(OSDTYPE_SPU); |
6110 | 4085 current_module=NULL; |
4086 } | |
4087 | |
1421 | 4088 } // while(!eof) |
1 | 4089 |
1567 | 4090 mp_msg(MSGT_GLOBAL,MSGL_V,"EOF code: %d \n",eof); |
1 | 4091 |
1639 | 4092 } |
4093 | |
3618 | 4094 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
|
4095 |
6138
523014df7d32
big cosmetics patch, cleanup of messages printed by mplayer and libs.
arpi
parents:
6135
diff
changeset
|
4096 mp_msg(MSGT_CPLAYER,MSGL_INFO,"\n"); |
523014df7d32
big cosmetics patch, cleanup of messages printed by mplayer and libs.
arpi
parents:
6135
diff
changeset
|
4097 |
4221 | 4098 if(benchmark){ |
4099 double tot=video_time_usage+vout_time_usage+audio_time_usage; | |
4100 double total_time_usage; | |
4101 total_time_usage_start=GetTimer()-total_time_usage_start; | |
4102 total_time_usage = (float)total_time_usage_start*0.000001; | |
5151 | 4103 mp_msg(MSGT_CPLAYER,MSGL_INFO,"\nBENCHMARKs: VC:%8.3fs VO:%8.3fs A:%8.3fs Sys:%8.3fs = %8.3fs\n", |
4221 | 4104 video_time_usage,vout_time_usage,audio_time_usage, |
4105 total_time_usage-tot,total_time_usage); | |
4106 if(total_time_usage>0.0) | |
5151 | 4107 mp_msg(MSGT_CPLAYER,MSGL_INFO,"BENCHMARK%%: VC:%8.4f%% VO:%8.4f%% A:%8.4f%% Sys:%8.4f%% = %8.4f%%\n", |
4221 | 4108 100.0*video_time_usage/total_time_usage, |
4109 100.0*vout_time_usage/total_time_usage, | |
4110 100.0*audio_time_usage/total_time_usage, | |
4111 100.0*(total_time_usage-tot)/total_time_usage, | |
4112 100.0); | |
5983 | 4113 if(total_frame_cnt && frame_dropping) |
5621 | 4114 mp_msg(MSGT_CPLAYER,MSGL_INFO,"BENCHMARKn: disp: %d (%3.2f fps) drop: %d (%d%%) total: %d (%3.2f fps)\n", |
4115 total_frame_cnt-drop_frame_cnt, | |
4116 (total_time_usage>0.5)?((total_frame_cnt-drop_frame_cnt)/total_time_usage):0, | |
4117 drop_frame_cnt, | |
4118 100*drop_frame_cnt/total_frame_cnt, | |
4119 total_frame_cnt, | |
4120 (total_time_usage>0.5)?(total_frame_cnt/total_time_usage):0); | |
4121 | |
4221 | 4122 } |
4123 | |
5983 | 4124 // time to uninit all, except global stuff: |
7677
33562a65e9e8
_EXPERIMENTAL_ option: -fixed-vo for libvo spec compliance testing
arpi
parents:
7628
diff
changeset
|
4125 uninit_player(INITED_ALL-(INITED_GUI+INITED_INPUT+(fixed_vo?INITED_VO:0))); |
5154 | 4126 |
9048 | 4127 #ifdef USE_SUB |
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9831
diff
changeset
|
4128 if ( set_of_sub_size > 0 ) |
9048 | 4129 { |
4130 current_module="sub_free"; | |
9870
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9831
diff
changeset
|
4131 for (i = 0; i < set_of_sub_size; ++i) |
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9831
diff
changeset
|
4132 sub_free( set_of_subtitles[i] ); |
09d630a4f991
support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents:
9831
diff
changeset
|
4133 set_of_sub_size = 0; |
14684 | 4134 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
|
4135 subdata=NULL; |
9048 | 4136 } |
4137 #endif | |
4138 | |
4156
22fadd4022b5
playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents:
4152
diff
changeset
|
4139 if(eof == PT_NEXT_ENTRY || eof == PT_PREV_ENTRY) { |
4221 | 4140 eof = eof == PT_NEXT_ENTRY ? 1 : -1; |
8198 | 4141 if(play_tree_iter_step(playtree_iter,play_tree_step,0) == PLAY_TREE_ITER_ENTRY) { |
4045
898caa690c0b
playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents:
3934
diff
changeset
|
4142 eof = 1; |
898caa690c0b
playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents:
3934
diff
changeset
|
4143 } else { |
898caa690c0b
playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents:
3934
diff
changeset
|
4144 play_tree_iter_free(playtree_iter); |
898caa690c0b
playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents:
3934
diff
changeset
|
4145 playtree_iter = NULL; |
898caa690c0b
playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents:
3934
diff
changeset
|
4146 } |
8198 | 4147 play_tree_step = 1; |
4156
22fadd4022b5
playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents:
4152
diff
changeset
|
4148 } else if (eof == PT_UP_NEXT || eof == PT_UP_PREV) { |
22fadd4022b5
playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents:
4152
diff
changeset
|
4149 eof = eof == PT_UP_NEXT ? 1 : -1; |
9368 | 4150 if ( playtree_iter ) { |
4151 if(play_tree_iter_up_step(playtree_iter,eof,0) == PLAY_TREE_ITER_ENTRY) { | |
4152 eof = 1; | |
4153 } else { | |
4154 play_tree_iter_free(playtree_iter); | |
4155 playtree_iter = NULL; | |
4156 } | |
4157 } | |
5154 | 4158 } else { // NEXT PREV SRC |
4156
22fadd4022b5
playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents:
4152
diff
changeset
|
4159 eof = 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
|
4160 } |
1639 | 4161 |
4045
898caa690c0b
playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents:
3934
diff
changeset
|
4162 if(eof == 0) eof = 1; |
1641
b7dae998505c
free stream/demuxer. continue playback with next file if error found
arpi
parents:
1639
diff
changeset
|
4163 |
4045
898caa690c0b
playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents:
3934
diff
changeset
|
4164 while(playtree_iter != NULL) { |
898caa690c0b
playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents:
3934
diff
changeset
|
4165 filename = play_tree_iter_get_file(playtree_iter,eof); |
898caa690c0b
playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents:
3934
diff
changeset
|
4166 if(filename == NULL) { |
898caa690c0b
playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents:
3934
diff
changeset
|
4167 if( play_tree_iter_step(playtree_iter,eof,0) != PLAY_TREE_ITER_ENTRY) { |
898caa690c0b
playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents:
3934
diff
changeset
|
4168 play_tree_iter_free(playtree_iter); |
898caa690c0b
playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents:
3934
diff
changeset
|
4169 playtree_iter = NULL; |
898caa690c0b
playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents:
3934
diff
changeset
|
4170 }; |
898caa690c0b
playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents:
3934
diff
changeset
|
4171 } else |
898caa690c0b
playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents:
3934
diff
changeset
|
4172 break; |
898caa690c0b
playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents:
3934
diff
changeset
|
4173 } |
898caa690c0b
playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents:
3934
diff
changeset
|
4174 |
5910
20c335d98ab3
fix fullscreen bug es ilyen libvo not initialized bug with gui igy
pontscho
parents:
5908
diff
changeset
|
4175 #ifdef HAVE_NEW_GUI |
20c335d98ab3
fix fullscreen bug es ilyen libvo not initialized bug with gui igy
pontscho
parents:
5908
diff
changeset
|
4176 if( use_gui && !playtree_iter ) |
20c335d98ab3
fix fullscreen bug es ilyen libvo not initialized bug with gui igy
pontscho
parents:
5908
diff
changeset
|
4177 { |
20c335d98ab3
fix fullscreen bug es ilyen libvo not initialized bug with gui igy
pontscho
parents:
5908
diff
changeset
|
4178 #ifdef USE_DVDREAD |
6280 | 4179 if ( !guiIntfStruct.DiskChanged ) |
5910
20c335d98ab3
fix fullscreen bug es ilyen libvo not initialized bug with gui igy
pontscho
parents:
5908
diff
changeset
|
4180 #endif |
6713 | 4181 mplEnd(); |
5910
20c335d98ab3
fix fullscreen bug es ilyen libvo not initialized bug with gui igy
pontscho
parents:
5908
diff
changeset
|
4182 } |
20c335d98ab3
fix fullscreen bug es ilyen libvo not initialized bug with gui igy
pontscho
parents:
5908
diff
changeset
|
4183 #endif |
20c335d98ab3
fix fullscreen bug es ilyen libvo not initialized bug with gui igy
pontscho
parents:
5908
diff
changeset
|
4184 |
10560 | 4185 if(use_gui || playtree_iter != NULL){ |
1641
b7dae998505c
free stream/demuxer. continue playback with next file if error found
arpi
parents:
1639
diff
changeset
|
4186 |
4045
898caa690c0b
playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents:
3934
diff
changeset
|
4187 eof = 0; |
1641
b7dae998505c
free stream/demuxer. continue playback with next file if error found
arpi
parents:
1639
diff
changeset
|
4188 goto play_next_file; |
1639 | 4189 } |
4190 | |
7122
0dc9cb756b68
freetype 2.0/2.1+ support - disabled by default until bugs fixed
arpi
parents:
7111
diff
changeset
|
4191 |
8644
0bfd73828e33
This patch fixes so that the exit code (or return code if you like) is set
arpi
parents:
8635
diff
changeset
|
4192 exit_player_with_rc(MSGTR_Exit_eof, 0); |
1639 | 4193 |
109 | 4194 return 1; |
4195 } |