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