annotate mplayer.c @ 13773:60c66b5aa2e1

Fixed 2 debug edl messages
author reynaldo
date Tue, 26 Oct 2004 21:38:57 +0000
parents 955ad54a9aab
children fb83e23e94ce
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
1430
1728d249c783 missing unistd.h (requires for off_t under freebsd)
arpi
parents: 1429
diff changeset
1 #include <stdio.h>
1728d249c783 missing unistd.h (requires for off_t under freebsd)
arpi
parents: 1429
diff changeset
2 #include <stdlib.h>
12360
85f18227756f 10l on cygwin WIN32 gets defined in config.h
faust3
parents: 12358
diff changeset
3 #include "config.h"
85f18227756f 10l on cygwin WIN32 gets defined in config.h
faust3
parents: 12358
diff changeset
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
1728d249c783 missing unistd.h (requires for off_t under freebsd)
arpi
parents: 1429
diff changeset
9 #include <string.h>
1728d249c783 missing unistd.h (requires for off_t under freebsd)
arpi
parents: 1429
diff changeset
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
0397b461f0fb MINGW32 port and select()less fifocode by Arpi
faust3
parents: 9752
diff changeset
14 #ifndef __MINGW32__
0397b461f0fb MINGW32 port and select()less fifocode by Arpi
faust3
parents: 9752
diff changeset
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
0397b461f0fb MINGW32 port and select()less fifocode by Arpi
faust3
parents: 9752
diff changeset
17 #else
0397b461f0fb MINGW32 port and select()less fifocode by Arpi
faust3
parents: 9752
diff changeset
18 #define SIGHUP 1 /* hangup */
0397b461f0fb MINGW32 port and select()less fifocode by Arpi
faust3
parents: 9752
diff changeset
19 #define SIGQUIT 3 /* quit */
0397b461f0fb MINGW32 port and select()less fifocode by Arpi
faust3
parents: 9752
diff changeset
20 #define SIGKILL 9 /* kill (cannot be caught or ignored) */
0397b461f0fb MINGW32 port and select()less fifocode by Arpi
faust3
parents: 9752
diff changeset
21 #define SIGBUS 10 /* bus error */
10928
f2313bd91594 add a read function for slave mode on mingw
faust3
parents: 10917
diff changeset
22 extern int mp_input_win32_slave_cmd_func(int fd,char* dest,int size);
9831
0397b461f0fb MINGW32 port and select()less fifocode by Arpi
faust3
parents: 9752
diff changeset
23 #endif
0397b461f0fb MINGW32 port and select()less fifocode by Arpi
faust3
parents: 9752
diff changeset
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
70fb281bb13c changed printf's to mp_msg
alex
parents: 5106
diff changeset
33 #include <errno.h>
70fb281bb13c changed printf's to mp_msg
alex
parents: 5106
diff changeset
34
1430
1728d249c783 missing unistd.h (requires for off_t under freebsd)
arpi
parents: 1429
diff changeset
35 #include "version.h"
1584
e49b3927c793 more messages for translator :)
arpi
parents: 1583
diff changeset
36
1564
9fa2a290fa99 mp_msg init
arpi
parents: 1548
diff changeset
37 #include "mp_msg.h"
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
38
1584
e49b3927c793 more messages for translator :)
arpi
parents: 1583
diff changeset
39 #define HELP_MP_DEFINE_STATIC
e49b3927c793 more messages for translator :)
arpi
parents: 1583
diff changeset
40 #include "help_mp.h"
e49b3927c793 more messages for translator :)
arpi
parents: 1583
diff changeset
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
3db72324a0fe Stream cleanup, don't use blah_on options anymore.
albeu
parents: 9695
diff changeset
44
151
9708d4b2765b cfgparser fix
szabii
parents: 150
diff changeset
45 #include "cfg-mplayer-def.h"
147
0a0d7dd8fb51 new command line/config file parser
szabii
parents: 117
diff changeset
46
1422
d02e0dcaf077 libvo2 support
arpi
parents: 1421
diff changeset
47 #ifdef USE_SUB
258
66017e126280 subtitles (.sub files) support
arpi_esp
parents: 240
diff changeset
48 #include "subreader.h"
1422
d02e0dcaf077 libvo2 support
arpi
parents: 1421
diff changeset
49 #endif
258
66017e126280 subtitles (.sub files) support
arpi_esp
parents: 240
diff changeset
50
36
846535ace7a2 libmpeg2-0.2.0 merge
arpi_esp
parents: 33
diff changeset
51 #include "libvo/video_out.h"
1422
d02e0dcaf077 libvo2 support
arpi
parents: 1421
diff changeset
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
5348fa1313fe OSD functionality improved
arpi_esp
parents: 215
diff changeset
54 #include "libvo/sub.h"
36
846535ace7a2 libmpeg2-0.2.0 merge
arpi_esp
parents: 33
diff changeset
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
3a3304cd9fd5 libao support
arpi_esp
parents: 940
diff changeset
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
3a3304cd9fd5 libao support
arpi_esp
parents: 940
diff changeset
62
303
828ec81e0d64 codecs.conf support
arpi_esp
parents: 296
diff changeset
63 #include "codec-cfg.h"
175
d43c7e6412f0 added DirectShow support
arpi_esp
parents: 162
diff changeset
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
ae78dd1d8daf Add vobsub support.
kmkaplan
parents: 4064
diff changeset
74 #include "vobsub.h"
492
888a85621f50 preliminary DVD support using libcss
lgb
parents: 487
diff changeset
75
9380
edfe34c5405d linux->osdep
arpi
parents: 9368
diff changeset
76 #include "osdep/getch2.h"
edfe34c5405d linux->osdep
arpi
parents: 9368
diff changeset
77 #include "osdep/timer.h"
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
78
2272
c26a9eff0993 cpu detection fixed
arpi
parents: 2265
diff changeset
79 #include "cpudetect.h"
c26a9eff0993 cpu detection fixed
arpi
parents: 2265
diff changeset
80
2036
029bad24d022 baz.. fixed wrong cvs merge.
atmos4
parents: 2034
diff changeset
81 #ifdef HAVE_NEW_GUI
4798
c39affa2b376 new interface ? :)
pontscho
parents: 4788
diff changeset
82 #include "Gui/interface.h"
2036
029bad24d022 baz.. fixed wrong cvs merge.
atmos4
parents: 2034
diff changeset
83 #endif
029bad24d022 baz.. fixed wrong cvs merge.
atmos4
parents: 2034
diff changeset
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
463699f15eb4 static removed from verbose definition
szabii
parents: 360
diff changeset
88 int verbose=0;
7864
dacc35bc92c7 add -identify switch
ranma
parents: 7854
diff changeset
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
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
91
398
f5918fc8df10 more cleanup of video decoding
arpi_esp
parents: 396
diff changeset
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
f5918fc8df10 more cleanup of video decoding
arpi_esp
parents: 396
diff changeset
94
3015
8bf21c807656 RTC is autodetected
arpi
parents: 2941
diff changeset
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
76c6d8f1ebf5 this is a combo patch that:
arpi
parents: 9593
diff changeset
103 #ifdef HAS_DVBIN_SUPPORT
76c6d8f1ebf5 this is a combo patch that:
arpi
parents: 9593
diff changeset
104 #include "libmpdemux/dvbin.h"
10708
a57e8d980652 This patch fixes:
alex
parents: 10707
diff changeset
105 static int last_dvb_step = 1;
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents: 9593
diff changeset
106 #endif
76c6d8f1ebf5 this is a combo patch that:
arpi
parents: 9593
diff changeset
107
258
66017e126280 subtitles (.sub files) support
arpi_esp
parents: 240
diff changeset
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
1935017c0f71 Experimantal OSD menu
albeu
parents: 8164
diff changeset
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
66017e126280 subtitles (.sub files) support
arpi_esp
parents: 240
diff changeset
140 // Config file
66017e126280 subtitles (.sub files) support
arpi_esp
parents: 240
diff changeset
141 //**************************************************************************//
66017e126280 subtitles (.sub files) support
arpi_esp
parents: 240
diff changeset
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
effc62af528c new option: -include
szabii
parents: 154
diff changeset
147 }
effc62af528c new option: -include
szabii
parents: 154
diff changeset
148
2557
6a74454ea121 some cleanup
arpi
parents: 2550
diff changeset
149 #include "get_path.c"
178
55206b791586 get_path()
szabii
parents: 175
diff changeset
150
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
151 //**************************************************************************//
9695
68c44d3530c8 Improved xscreensaver support.
ranma
parents: 9610
diff changeset
152 // XScreensaver
68c44d3530c8 Improved xscreensaver support.
ranma
parents: 9610
diff changeset
153 //**************************************************************************//
68c44d3530c8 Improved xscreensaver support.
ranma
parents: 9610
diff changeset
154
10661
49d7d02f4485 X11_FULLSCREEN vs HAVE_X11 definitions and some warning fixes
alex
parents: 10646
diff changeset
155 #ifdef HAVE_X11
11999
239623f1e8a1 Use system clock for xscreensaver pings
ranma
parents: 11977
diff changeset
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
68c44d3530c8 Improved xscreensaver support.
ranma
parents: 9610
diff changeset
158
68c44d3530c8 Improved xscreensaver support.
ranma
parents: 9610
diff changeset
159 //**************************************************************************//
442
0828c5d13418 fixed mplayer.c
gabucino
parents: 440
diff changeset
160 //**************************************************************************//
0828c5d13418 fixed mplayer.c
gabucino
parents: 440
diff changeset
161 // Input media streaming & demultiplexer:
0828c5d13418 fixed mplayer.c
gabucino
parents: 440
diff changeset
162 //**************************************************************************//
0828c5d13418 fixed mplayer.c
gabucino
parents: 440
diff changeset
163
1289
3f490fad9bdf some code clanup (first step to libdemuxer)
arpi
parents: 1286
diff changeset
164 static int max_framesize=0;
3f490fad9bdf some code clanup (first step to libdemuxer)
arpi
parents: 1286
diff changeset
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
faust3
parents: 13129
diff changeset
170 #ifdef HAVE_MATROSKA
faust3
parents: 13129
diff changeset
171 #include "libmpdemux/matroska.h"
faust3
parents: 13129
diff changeset
172 #endif
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
173
5607
1972c3475d93 mp_image.h and img_format.h moved to libmpcodecs
arpi
parents: 5572
diff changeset
174 #include "libmpcodecs/dec_audio.h"
1972c3475d93 mp_image.h and img_format.h moved to libmpcodecs
arpi
parents: 5572
diff changeset
175 #include "libmpcodecs/dec_video.h"
8198
1935017c0f71 Experimantal OSD menu
albeu
parents: 8164
diff changeset
176 #include "libmpcodecs/mp_image.h"
1935017c0f71 Experimantal OSD menu
albeu
parents: 8164
diff changeset
177 #include "libmpcodecs/vf.h"
2563
fc124f9db88e more cleanup, warnings fixed
arpi
parents: 2557
diff changeset
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
3b4ccfecb823 using setjmp/longjmp to handle sig11 in libmpeg2
arpi_esp
parents: 109
diff changeset
181 //**************************************************************************//
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
182 //**************************************************************************//
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
183
112
b69d29c06b3f code cleanup around codecctrl
arpi_esp
parents: 111
diff changeset
184 // Common FIFO functions, and keyboard/event FIFO code
b69d29c06b3f code cleanup around codecctrl
arpi_esp
parents: 111
diff changeset
185 #include "fifo.c"
12816
fba780800efe -use-stdin renamed to -noconsolecontrols.
diego
parents: 12753
diff changeset
186 int noconsolecontrols=0;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
187 //**************************************************************************//
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
188
6755
a31b9f15cbff - fix audio equalizer
pontscho
parents: 6713
diff changeset
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
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
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
6a74454ea121 some cleanup
arpi
parents: 2550
diff changeset
195 // benchmark:
1291
36ed1692c0b8 video codec stuff moved to dec_video.c
arpi
parents: 1289
diff changeset
196 double video_time_usage=0;
36ed1692c0b8 video codec stuff moved to dec_video.c
arpi
parents: 1289
diff changeset
197 double vout_time_usage=0;
1289
3f490fad9bdf some code clanup (first step to libdemuxer)
arpi
parents: 1286
diff changeset
198 static double audio_time_usage=0;
3f490fad9bdf some code clanup (first step to libdemuxer)
arpi
parents: 1286
diff changeset
199 static int total_time_usage_start=0;
5621
0426f9b887cd some more statistics: BENCHMARKn
arpi
parents: 5612
diff changeset
200 static int total_frame_cnt=0;
0426f9b887cd some more statistics: BENCHMARKn
arpi
parents: 5612
diff changeset
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
9c828335b2d0 add preferences to gui
pontscho
parents: 6792
diff changeset
205 int auto_quality=0;
1496
8c3e93ef116d cleanup...
arpi
parents: 1487
diff changeset
206 static int output_quality=0;
1439
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
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
a4e0211455d8 GUI integration, step 1
arpi
parents: 1694
diff changeset
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
a4e0211455d8 GUI integration, step 1
arpi
parents: 1694
diff changeset
217
6921
762c98c47f01 osdlevel=1 by default
arpi
parents: 6914
diff changeset
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
6a74454ea121 some cleanup
arpi
parents: 2550
diff changeset
221
6a74454ea121 some cleanup
arpi
parents: 2550
diff changeset
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
6e190ea2abba don't show OSD progbar when -loop seeks back
arpi
parents: 8745
diff changeset
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
37ab4e646f65 add autosync && some 10l bugfix
pontscho
parents: 8306
diff changeset
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
6a74454ea121 some cleanup
arpi
parents: 2550
diff changeset
233 float rel_seek_secs=0;
6a74454ea121 some cleanup
arpi
parents: 2550
diff changeset
234 int abs_seek_pos=0;
6a74454ea121 some cleanup
arpi
parents: 2550
diff changeset
235
6a74454ea121 some cleanup
arpi
parents: 2550
diff changeset
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
19998399f4d5 Made audio_id and video_id non static variable.
bertrand
parents: 3499
diff changeset
243 int audio_id=-1;
19998399f4d5 Made audio_id and video_id non static variable.
bertrand
parents: 3499
diff changeset
244 int video_id=-1;
3618
772729dd7b40 better dvd support
pontscho
parents: 3597
diff changeset
245 int dvdsub_id=-1;
4079
ae78dd1d8daf Add vobsub support.
kmkaplan
parents: 4064
diff changeset
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
fd3ac41ee1a1 add equalizer support and fix some small bug...
pontscho
parents: 6623
diff changeset
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
a3daec6c49e4 cache full status added
arpi
parents: 2342
diff changeset
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
a3daec6c49e4 cache full status added
arpi
parents: 2342
diff changeset
255 #ifdef USE_STREAM_CACHE
a3daec6c49e4 cache full status added
arpi
parents: 2342
diff changeset
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
a3daec6c49e4 cache full status added
arpi
parents: 2342
diff changeset
260 #else
a3daec6c49e4 cache full status added
arpi
parents: 2342
diff changeset
261 #define cache_fill_status 0
a3daec6c49e4 cache full status added
arpi
parents: 2342
diff changeset
262 #endif
a3daec6c49e4 cache full status added
arpi
parents: 2342
diff changeset
263
2557
6a74454ea121 some cleanup
arpi
parents: 2550
diff changeset
264 // dump:
3257
b59502557e39 -dumpstream
arpi
parents: 3234
diff changeset
265 static char *stream_dump_name="stream.dump";
6796
9c828335b2d0 add preferences to gui
pontscho
parents: 6792
diff changeset
266 int stream_dump_type=0;
2557
6a74454ea121 some cleanup
arpi
parents: 2550
diff changeset
267
6a74454ea121 some cleanup
arpi
parents: 2550
diff changeset
268 // A-V sync:
1498
6174b815b5f4 PTS calc updates, fixes, cleanups, mess...
arpi
parents: 1497
diff changeset
269 static float default_max_pts_correction=-1;//0.01f;
6174b815b5f4 PTS calc updates, fixes, cleanups, mess...
arpi
parents: 1497
diff changeset
270 static float max_pts_correction=0;//default_max_pts_correction;
2557
6a74454ea121 some cleanup
arpi
parents: 2550
diff changeset
271 static float c_total=0;
6796
9c828335b2d0 add preferences to gui
pontscho
parents: 6792
diff changeset
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
4a42c0604ce1 - rewrite sub_fps
pontscho
parents: 9049
diff changeset
276 float force_fps=0;
2557
6a74454ea121 some cleanup
arpi
parents: 2550
diff changeset
277 static int force_srate=0;
7614
ce6a938aa6d3 Adding -format and -af switches
anders
parents: 7605
diff changeset
278 static int audio_output_format=0;
6796
9c828335b2d0 add preferences to gui
pontscho
parents: 6792
diff changeset
279 int frame_dropping=0; // option 0=no drop 1= drop vo 2= drop decode
2557
6a74454ea121 some cleanup
arpi
parents: 2550
diff changeset
280 static int play_n_frames=-1;
6590
bfc209bb3f48 -frames 0 fix, multifile frames support by tibcu
alex
parents: 6585
diff changeset
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
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
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
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5072
diff changeset
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
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5072
diff changeset
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
7034ef1f685d new option: -font
arpi_esp
parents: 208
diff changeset
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
alex
parents: 11580
diff changeset
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
09d565842a33 font alpha resampling, see -ffactor
arpi_esp
parents: 212
diff changeset
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
66017e126280 subtitles (.sub files) support
arpi_esp
parents: 240
diff changeset
300 float sub_delay=0;
66017e126280 subtitles (.sub files) support
arpi_esp
parents: 240
diff changeset
301 float sub_fps=0;
510
2951d138ddaf add sub autoread & remove 'c' key
pontscho
parents: 500
diff changeset
302 int sub_auto = 1;
4079
ae78dd1d8daf Add vobsub support.
kmkaplan
parents: 4064
diff changeset
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
b212f74e14ec - add play time subtitle change support
pontscho
parents: 7142
diff changeset
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
b212f74e14ec - add play time subtitle change support
pontscho
parents: 7142
diff changeset
311 float sub_last_pts = -303;
b212f74e14ec - add play time subtitle change support
pontscho
parents: 7142
diff changeset
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
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
321
2321
5413f4fc560f uninit stream
arpi
parents: 2314
diff changeset
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
52fc1dc76652 uninit fixed
arpi
parents: 1852
diff changeset
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
924263b4df10 eq reworked
alex
parents: 6755
diff changeset
334
6755
a31b9f15cbff - fix audio equalizer
pontscho
parents: 6713
diff changeset
335 // ---
a31b9f15cbff - fix audio equalizer
pontscho
parents: 6713
diff changeset
336
8198
1935017c0f71 Experimantal OSD menu
albeu
parents: 8164
diff changeset
337 #ifdef HAVE_MENU
1935017c0f71 Experimantal OSD menu
albeu
parents: 8164
diff changeset
338 #include "m_struct.h"
1935017c0f71 Experimantal OSD menu
albeu
parents: 8164
diff changeset
339 #include "libmenu/menu.h"
1935017c0f71 Experimantal OSD menu
albeu
parents: 8164
diff changeset
340 extern void vf_menu_pause_update(struct vf_instance_s* vf);
1935017c0f71 Experimantal OSD menu
albeu
parents: 8164
diff changeset
341 extern vf_info_t vf_info_menu;
1935017c0f71 Experimantal OSD menu
albeu
parents: 8164
diff changeset
342 static vf_info_t* libmenu_vfs[] = {
1935017c0f71 Experimantal OSD menu
albeu
parents: 8164
diff changeset
343 &vf_info_menu,
1935017c0f71 Experimantal OSD menu
albeu
parents: 8164
diff changeset
344 NULL
1935017c0f71 Experimantal OSD menu
albeu
parents: 8164
diff changeset
345 };
1935017c0f71 Experimantal OSD menu
albeu
parents: 8164
diff changeset
346 static vf_instance_t* vf_menu = NULL;
1935017c0f71 Experimantal OSD menu
albeu
parents: 8164
diff changeset
347 static int use_menu = 0;
1935017c0f71 Experimantal OSD menu
albeu
parents: 8164
diff changeset
348 static char* menu_cfg = NULL;
1935017c0f71 Experimantal OSD menu
albeu
parents: 8164
diff changeset
349 static char* menu_root = "main";
1935017c0f71 Experimantal OSD menu
albeu
parents: 8164
diff changeset
350 #endif
1935017c0f71 Experimantal OSD menu
albeu
parents: 8164
diff changeset
351
1935017c0f71 Experimantal OSD menu
albeu
parents: 8164
diff changeset
352
5055
534167719e91 nortc patch by Attila Kinali
atmos4
parents: 5046
diff changeset
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
6d815f12e3e5 rtc-device cmd option by James Noble
alex
parents: 12672
diff changeset
355 static char* rtc_device;
5055
534167719e91 nortc patch by Attila Kinali
atmos4
parents: 5046
diff changeset
356 #endif
534167719e91 nortc patch by Attila Kinali
atmos4
parents: 5046
diff changeset
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
52fc1dc76652 uninit fixed
arpi
parents: 1852
diff changeset
368 static unsigned int inited_flags=0;
52fc1dc76652 uninit fixed
arpi
parents: 1852
diff changeset
369 #define INITED_VO 1
52fc1dc76652 uninit fixed
arpi
parents: 1852
diff changeset
370 #define INITED_AO 2
52fc1dc76652 uninit fixed
arpi
parents: 1852
diff changeset
371 #define INITED_GUI 4
52fc1dc76652 uninit fixed
arpi
parents: 1852
diff changeset
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
5413f4fc560f uninit stream
arpi
parents: 2314
diff changeset
374 #define INITED_STREAM 64
4431
44c23fd75005 Added uninit to input
albeu
parents: 4418
diff changeset
375 #define INITED_INPUT 128
6110
7bea806b9c5f Improvment for spu subtitles.
albeu
parents: 6082
diff changeset
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
52fc1dc76652 uninit fixed
arpi
parents: 1852
diff changeset
380 #define INITED_ALL 0xFFFF
52fc1dc76652 uninit fixed
arpi
parents: 1852
diff changeset
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
52fc1dc76652 uninit fixed
arpi
parents: 1852
diff changeset
383 mask=inited_flags&mask;
5154
f67115a72b7c init/uninit libvo/ao/getch2/cache2 order fixed
arpi
parents: 5151
diff changeset
384
f67115a72b7c init/uninit libvo/ao/getch2/cache2 order fixed
arpi
parents: 5151
diff changeset
385 mp_msg(MSGT_CPLAYER,MSGL_DBG2,"\n*** uninit(0x%X)\n",mask);
f67115a72b7c init/uninit libvo/ao/getch2/cache2 order fixed
arpi
parents: 5151
diff changeset
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
1935017c0f71 Experimantal OSD menu
albeu
parents: 8164
diff changeset
399 #ifdef HAVE_MENU
1935017c0f71 Experimantal OSD menu
albeu
parents: 8164
diff changeset
400 vf_menu=NULL;
1935017c0f71 Experimantal OSD menu
albeu
parents: 8164
diff changeset
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
3738cc2269a3 get stream back from the demuxer
arpi
parents: 7923
diff changeset
407 if(demuxer){
3738cc2269a3 get stream back from the demuxer
arpi
parents: 7923
diff changeset
408 stream=demuxer->stream;
3738cc2269a3 get stream back from the demuxer
arpi
parents: 7923
diff changeset
409 free_demuxer(demuxer);
3738cc2269a3 get stream back from the demuxer
arpi
parents: 7923
diff changeset
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
f67115a72b7c init/uninit libvo/ao/getch2/cache2 order fixed
arpi
parents: 5151
diff changeset
415 if(mask&INITED_STREAM){
f67115a72b7c init/uninit libvo/ao/getch2/cache2 order fixed
arpi
parents: 5151
diff changeset
416 inited_flags&=~INITED_STREAM;
f67115a72b7c init/uninit libvo/ao/getch2/cache2 order fixed
arpi
parents: 5151
diff changeset
417 current_module="uninit_stream";
f67115a72b7c init/uninit libvo/ao/getch2/cache2 order fixed
arpi
parents: 5151
diff changeset
418 if(stream) free_stream(stream);
f67115a72b7c init/uninit libvo/ao/getch2/cache2 order fixed
arpi
parents: 5151
diff changeset
419 stream=NULL;
f67115a72b7c init/uninit libvo/ao/getch2/cache2 order fixed
arpi
parents: 5151
diff changeset
420 }
f67115a72b7c init/uninit libvo/ao/getch2/cache2 order fixed
arpi
parents: 5151
diff changeset
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
f67115a72b7c init/uninit libvo/ao/getch2/cache2 order fixed
arpi
parents: 5151
diff changeset
430 if(mask&INITED_GETCH2){
f67115a72b7c init/uninit libvo/ao/getch2/cache2 order fixed
arpi
parents: 5151
diff changeset
431 inited_flags&=~INITED_GETCH2;
f67115a72b7c init/uninit libvo/ao/getch2/cache2 order fixed
arpi
parents: 5151
diff changeset
432 current_module="uninit_getch2";
f67115a72b7c init/uninit libvo/ao/getch2/cache2 order fixed
arpi
parents: 5151
diff changeset
433 mp_msg(MSGT_CPLAYER,MSGL_DBG2,"\n[[[uninit getch2]]]\n");
f67115a72b7c init/uninit libvo/ao/getch2/cache2 order fixed
arpi
parents: 5151
diff changeset
434 // restore terminal:
f67115a72b7c init/uninit libvo/ao/getch2/cache2 order fixed
arpi
parents: 5151
diff changeset
435 getch2_disable();
f67115a72b7c init/uninit libvo/ao/getch2/cache2 order fixed
arpi
parents: 5151
diff changeset
436 }
f67115a72b7c init/uninit libvo/ao/getch2/cache2 order fixed
arpi
parents: 5151
diff changeset
437
6110
7bea806b9c5f Improvment for spu subtitles.
albeu
parents: 6082
diff changeset
438 if(mask&INITED_VOBSUB){
7bea806b9c5f Improvment for spu subtitles.
albeu
parents: 6082
diff changeset
439 inited_flags&=~INITED_VOBSUB;
7bea806b9c5f Improvment for spu subtitles.
albeu
parents: 6082
diff changeset
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
7bea806b9c5f Improvment for spu subtitles.
albeu
parents: 6082
diff changeset
442 vo_vobsub=NULL;
7bea806b9c5f Improvment for spu subtitles.
albeu
parents: 6082
diff changeset
443 }
7bea806b9c5f Improvment for spu subtitles.
albeu
parents: 6082
diff changeset
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
6918c74caa4d 1 step closed to solving memory corruptions
arpi
parents: 5410
diff changeset
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
52fc1dc76652 uninit fixed
arpi
parents: 1852
diff changeset
452 if(mask&INITED_AO){
52fc1dc76652 uninit fixed
arpi
parents: 1852
diff changeset
453 inited_flags&=~INITED_AO;
52fc1dc76652 uninit fixed
arpi
parents: 1852
diff changeset
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
52fc1dc76652 uninit fixed
arpi
parents: 1852
diff changeset
456 }
52fc1dc76652 uninit fixed
arpi
parents: 1852
diff changeset
457
52fc1dc76652 uninit fixed
arpi
parents: 1852
diff changeset
458 #ifdef HAVE_NEW_GUI
52fc1dc76652 uninit fixed
arpi
parents: 1852
diff changeset
459 if(mask&INITED_GUI){
52fc1dc76652 uninit fixed
arpi
parents: 1852
diff changeset
460 inited_flags&=~INITED_GUI;
52fc1dc76652 uninit fixed
arpi
parents: 1852
diff changeset
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
52fc1dc76652 uninit fixed
arpi
parents: 1852
diff changeset
463 }
52fc1dc76652 uninit fixed
arpi
parents: 1852
diff changeset
464 #endif
52fc1dc76652 uninit fixed
arpi
parents: 1852
diff changeset
465
5830
4c17a92220fc uninit libvo before getch2 - requires for clean svgalib uninit
arpi
parents: 5798
diff changeset
466 if(mask&INITED_INPUT){
6429
bff56f37f2ff 10l typo, noticed by Nick K.
arpi
parents: 6311
diff changeset
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
44c23fd75005 Added uninit to input
albeu
parents: 4418
diff changeset
471
1863
bb7710b16dc2 reset module status after uninit
arpi
parents: 1857
diff changeset
472 current_module=NULL;
1856
52fc1dc76652 uninit fixed
arpi
parents: 1852
diff changeset
473 }
52fc1dc76652 uninit fixed
arpi
parents: 1852
diff changeset
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
5dc01778e055 has_audio checkings at reset and exit added
al3x
parents: 1125
diff changeset
476
1856
52fc1dc76652 uninit fixed
arpi
parents: 1852
diff changeset
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
be9cd7d845c2 -zoom, -fs with x[11|mga|v] fix -- round two
pontscho
parents: 6015
diff changeset
479 #ifdef HAVE_NEW_GUI
be9cd7d845c2 -zoom, -fs with x[11|mga|v] fix -- round two
pontscho
parents: 6015
diff changeset
480 if ( !use_gui )
be9cd7d845c2 -zoom, -fs with x[11|mga|v] fix -- round two
pontscho
parents: 6015
diff changeset
481 #endif
6015
04fe086ae486 vo_uninit fixed
arpi
parents: 6013
diff changeset
482 vo_uninit(); // close the X11 connection (if any opened)
04fe086ae486 vo_uninit fixed
arpi
parents: 6013
diff changeset
483 #endif
1723
5e4214a7540e GUI stuff. now seeking works, and xmga renders to video window
arpi
parents: 1709
diff changeset
484
1856
52fc1dc76652 uninit fixed
arpi
parents: 1852
diff changeset
485 current_module="exit_player";
1156
5dc01778e055 has_audio checkings at reset and exit added
al3x
parents: 1125
diff changeset
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
fcce0023bf55 printf -> mp_msg conversion, first steps
diego
parents: 13116
diff changeset
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
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
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
5dc01778e055 has_audio checkings at reset and exit added
al3x
parents: 1125
diff changeset
498 }
5dc01778e055 has_audio checkings at reset and exit added
al3x
parents: 1125
diff changeset
499
13391
b6c3752d9544 handle sigchld in mplayer.c
faust3
parents: 13358
diff changeset
500 #ifndef __MINGW32__
b6c3752d9544 handle sigchld in mplayer.c
faust3
parents: 13358
diff changeset
501 static void child_sighandler(int x){
b6c3752d9544 handle sigchld in mplayer.c
faust3
parents: 13358
diff changeset
502 pid_t pid;
b6c3752d9544 handle sigchld in mplayer.c
faust3
parents: 13358
diff changeset
503 while((pid=waitpid(-1,NULL,WNOHANG)) > 0);
b6c3752d9544 handle sigchld in mplayer.c
faust3
parents: 13358
diff changeset
504 }
b6c3752d9544 handle sigchld in mplayer.c
faust3
parents: 13358
diff changeset
505 #endif
b6c3752d9544 handle sigchld in mplayer.c
faust3
parents: 13358
diff changeset
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
5dc01778e055 has_audio checkings at reset and exit added
al3x
parents: 1125
diff changeset
508 static int sig_count=0;
5dc01778e055 has_audio checkings at reset and exit added
al3x
parents: 1125
diff changeset
509 ++sig_count;
13298
a7bde33bd7d8 Don't leave a messed up terminal after a crash
rtognimp
parents: 13269
diff changeset
510 if(inited_flags==0 && sig_count>1) exit(1);
a7bde33bd7d8 Don't leave a messed up terminal after a crash
rtognimp
parents: 13269
diff changeset
511 if(sig_count==5)
a7bde33bd7d8 Don't leave a messed up terminal after a crash
rtognimp
parents: 13269
diff changeset
512 {
a7bde33bd7d8 Don't leave a messed up terminal after a crash
rtognimp
parents: 13269
diff changeset
513 /* We're crashing bad and can't uninit cleanly :(
a7bde33bd7d8 Don't leave a messed up terminal after a crash
rtognimp
parents: 13269
diff changeset
514 * by popular request, we make one last (dirty)
a7bde33bd7d8 Don't leave a messed up terminal after a crash
rtognimp
parents: 13269
diff changeset
515 * effort to restore the user's
a7bde33bd7d8 Don't leave a messed up terminal after a crash
rtognimp
parents: 13269
diff changeset
516 * terminal. */
a7bde33bd7d8 Don't leave a messed up terminal after a crash
rtognimp
parents: 13269
diff changeset
517 getch2_disable();
a7bde33bd7d8 Don't leave a messed up terminal after a crash
rtognimp
parents: 13269
diff changeset
518 exit(1);
a7bde33bd7d8 Don't leave a messed up terminal after a crash
rtognimp
parents: 13269
diff changeset
519 }
a7bde33bd7d8 Don't leave a messed up terminal after a crash
rtognimp
parents: 13269
diff changeset
520 if(sig_count==6) exit(1);
a7bde33bd7d8 Don't leave a messed up terminal after a crash
rtognimp
parents: 13269
diff changeset
521 if(sig_count>6){
1156
5dc01778e055 has_audio checkings at reset and exit added
al3x
parents: 1125
diff changeset
522 // can't stop :(
9831
0397b461f0fb MINGW32 port and select()less fifocode by Arpi
faust3
parents: 9752
diff changeset
523 #ifndef __MINGW32__
1156
5dc01778e055 has_audio checkings at reset and exit added
al3x
parents: 1125
diff changeset
524 kill(getpid(),SIGKILL);
9831
0397b461f0fb MINGW32 port and select()less fifocode by Arpi
faust3
parents: 9752
diff changeset
525 #endif
1156
5dc01778e055 has_audio checkings at reset and exit added
al3x
parents: 1125
diff changeset
526 }
5127
621a68b911a9 hints on RTFM
arpi
parents: 5112
diff changeset
527 mp_msg(MSGT_CPLAYER,MSGL_FATAL,"\n" MSGTR_IntBySignal,x,
5106
40d2bcb1b671 using mp_gettext
alex
parents: 5091
diff changeset
528 current_module?current_module:mp_gettext("unknown")
1156
5dc01778e055 has_audio checkings at reset and exit added
al3x
parents: 1125
diff changeset
529 );
5830
4c17a92220fc uninit libvo before getch2 - requires for clean svgalib uninit
arpi
parents: 5798
diff changeset
530 if(sig_count==1)
5127
621a68b911a9 hints on RTFM
arpi
parents: 5112
diff changeset
531 switch(x){
621a68b911a9 hints on RTFM
arpi
parents: 5112
diff changeset
532 case SIGINT:
621a68b911a9 hints on RTFM
arpi
parents: 5112
diff changeset
533 case SIGQUIT:
621a68b911a9 hints on RTFM
arpi
parents: 5112
diff changeset
534 case SIGTERM:
621a68b911a9 hints on RTFM
arpi
parents: 5112
diff changeset
535 case SIGKILL:
621a68b911a9 hints on RTFM
arpi
parents: 5112
diff changeset
536 break; // killed from keyboard (^C) or killed [-9]
621a68b911a9 hints on RTFM
arpi
parents: 5112
diff changeset
537 case SIGILL:
5129
7de3c4209461 rtfm hint msg depends on runtime detection
arpi
parents: 5127
diff changeset
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
7de3c4209461 rtfm hint msg depends on runtime detection
arpi
parents: 5127
diff changeset
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
7de3c4209461 rtfm hint msg depends on runtime detection
arpi
parents: 5127
diff changeset
542 #endif
5127
621a68b911a9 hints on RTFM
arpi
parents: 5112
diff changeset
543 case SIGFPE:
621a68b911a9 hints on RTFM
arpi
parents: 5112
diff changeset
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
621a68b911a9 hints on RTFM
arpi
parents: 5112
diff changeset
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
621a68b911a9 hints on RTFM
arpi
parents: 5112
diff changeset
548 }
1156
5dc01778e055 has_audio checkings at reset and exit added
al3x
parents: 1125
diff changeset
549 exit_player(NULL);
5dc01778e055 has_audio checkings at reset and exit added
al3x
parents: 1125
diff changeset
550 }
5dc01778e055 has_audio checkings at reset and exit added
al3x
parents: 1125
diff changeset
551
2557
6a74454ea121 some cleanup
arpi
parents: 2550
diff changeset
552 //extern void write_avi_header_1(FILE *f,int fcc,float fps,int width,int height);
1439
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
553
7867
3dc0b71630ff cleanup config option handling in libmpdemux.
arpi
parents: 7864
diff changeset
554 extern void mp_input_register_options(m_config_t* cfg);
4659
31265995cc3a Place holder for registering modules options
albeu
parents: 4655
diff changeset
555
459
9dfad88a8107 add mixer support
pontscho
parents: 458
diff changeset
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
0a0d7dd8fb51 new command line/config file parser
szabii
parents: 117
diff changeset
561 #include "cfg-mplayer.h"
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
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
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
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
77b3bc17d764 make sure exit_player gets called
joey
parents: 13391
diff changeset
568 exit_player(NULL);
178
55206b791586 get_path()
szabii
parents: 175
diff changeset
569 if ((conffile = get_path("")) == NULL) {
1583
ca7bf882d2f8 ehh. mp_msgt->mp_msg
arpi
parents: 1582
diff changeset
570 mp_msg(MSGT_CPLAYER,MSGL_WARN,MSGTR_NoHomeDir);
147
0a0d7dd8fb51 new command line/config file parser
szabii
parents: 117
diff changeset
571 } else {
9831
0397b461f0fb MINGW32 port and select()less fifocode by Arpi
faust3
parents: 9752
diff changeset
572 #ifdef __MINGW32__
0397b461f0fb MINGW32 port and select()less fifocode by Arpi
faust3
parents: 9752
diff changeset
573 mkdir(conffile);
0397b461f0fb MINGW32 port and select()less fifocode by Arpi
faust3
parents: 9752
diff changeset
574 #else
178
55206b791586 get_path()
szabii
parents: 175
diff changeset
575 mkdir(conffile, 0777);
9831
0397b461f0fb MINGW32 port and select()less fifocode by Arpi
faust3
parents: 9752
diff changeset
576 #endif
178
55206b791586 get_path()
szabii
parents: 175
diff changeset
577 free(conffile);
55206b791586 get_path()
szabii
parents: 175
diff changeset
578 if ((conffile = get_path("config")) == NULL) {
1583
ca7bf882d2f8 ehh. mp_msgt->mp_msg
arpi
parents: 1582
diff changeset
579 mp_msg(MSGT_CPLAYER,MSGL_ERR,MSGTR_GetpathProblem);
178
55206b791586 get_path()
szabii
parents: 175
diff changeset
580 } else {
55206b791586 get_path()
szabii
parents: 175
diff changeset
581 if ((conffile_fd = open(conffile, O_CREAT | O_EXCL | O_WRONLY, 0666)) != -1) {
1582
12aa68bf2ff5 erros emssages moved to help_mp.h for translation
arpi
parents: 1567
diff changeset
582 mp_msg(MSGT_CPLAYER,MSGL_INFO,MSGTR_CreatingCfgFile, conffile);
178
55206b791586 get_path()
szabii
parents: 175
diff changeset
583 write(conffile_fd, default_config, strlen(default_config));
55206b791586 get_path()
szabii
parents: 175
diff changeset
584 close(conffile_fd);
55206b791586 get_path()
szabii
parents: 175
diff changeset
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
77b3bc17d764 make sure exit_player gets called
joey
parents: 13391
diff changeset
587 exit_player(NULL);
178
55206b791586 get_path()
szabii
parents: 175
diff changeset
588 free(conffile);
151
9708d4b2765b cfgparser fix
szabii
parents: 150
diff changeset
589 }
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
590 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
591 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
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
a8c4246b6869 PATH_MAX fixed
arpi
parents: 8627
diff changeset
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 {
13577
606d90e03a2f printf --> mp_msg conversion
diego
parents: 13502
diff changeset
604 mp_msg(MSGT_CPLAYER,MSGL_INFO,MSGTR_LoadingConfig, cfg);
8614
49e36bf2f342 The patch adds support for a per-file config, which is loaded before
arpi
parents: 8612
diff changeset
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 {
13577
606d90e03a2f printf --> mp_msg conversion
diego
parents: 13502
diff changeset
618 mp_msg(MSGT_CPLAYER,MSGL_INFO,MSGTR_LoadingConfig, confpath);
8614
49e36bf2f342 The patch adds support for a per-file config, which is loaded before
arpi
parents: 8612
diff changeset
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;
13603
80fc8f48f14c Do not loose commands while paused.
reimar
parents: 13577
diff changeset
631 if((cmd = mp_input_get_cmd(0,0,0)) != NULL) {
4825
41d2da3bd082 Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents: 4818
diff changeset
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
047bbb973011 windows path seperator fixes
joey
parents: 12981
diff changeset
650 #define mp_basename2(s) (strrchr(s,'/')==NULL?(char*)s:(strrchr(s,'/')+1))
047bbb973011 windows path seperator fixes
joey
parents: 12981
diff changeset
651 #define mp_basename(s) (strrchr(s,'\\')==NULL?(mp_basename2(s)):(strrchr(s,'\\')+1))
8937
afca652cb0e5 patch adds support for MOV-Reference-Files.
arpi
parents: 8932
diff changeset
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
1935017c0f71 Experimantal OSD menu
albeu
parents: 8164
diff changeset
690 static int play_tree_step = 1;
1935017c0f71 Experimantal OSD menu
albeu
parents: 8164
diff changeset
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;
13577
606d90e03a2f printf --> mp_msg conversion
diego
parents: 13502
diff changeset
725 mp_msg(MSGT_FIXME, MSGL_FIXME, MSGTR_AddedSubtitleFile, set_of_sub_size, filename);
9870
09d630a4f991 support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents: 9831
diff changeset
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
13710
d7af73cc38da allow changing playback speed during playback.
reimar
parents: 13684
diff changeset
759 /**
d7af73cc38da allow changing playback speed during playback.
reimar
parents: 13684
diff changeset
760 * \brief build a chain of audio filters that converts the input format
d7af73cc38da allow changing playback speed during playback.
reimar
parents: 13684
diff changeset
761 * to the ao's format, taking into account the current playback_speed.
d7af73cc38da allow changing playback speed during playback.
reimar
parents: 13684
diff changeset
762 * \param sh_audio describes the requested input format of the chain.
d7af73cc38da allow changing playback speed during playback.
reimar
parents: 13684
diff changeset
763 * \param ao_data describes the requested output format of the chain.
d7af73cc38da allow changing playback speed during playback.
reimar
parents: 13684
diff changeset
764 */
d7af73cc38da allow changing playback speed during playback.
reimar
parents: 13684
diff changeset
765 static int build_afilter_chain(sh_audio_t *sh_audio, ao_data_t *ao_data)
d7af73cc38da allow changing playback speed during playback.
reimar
parents: 13684
diff changeset
766 {
d7af73cc38da allow changing playback speed during playback.
reimar
parents: 13684
diff changeset
767 int new_srate = sh_audio->samplerate * playback_speed;
d7af73cc38da allow changing playback speed during playback.
reimar
parents: 13684
diff changeset
768 if (!sh_audio)
d7af73cc38da allow changing playback speed during playback.
reimar
parents: 13684
diff changeset
769 return 0;
d7af73cc38da allow changing playback speed during playback.
reimar
parents: 13684
diff changeset
770 if (new_srate != ao_data->samplerate) {
d7af73cc38da allow changing playback speed during playback.
reimar
parents: 13684
diff changeset
771 // limits are taken from libaf/af_resample.c
d7af73cc38da allow changing playback speed during playback.
reimar
parents: 13684
diff changeset
772 if (new_srate < 8000)
d7af73cc38da allow changing playback speed during playback.
reimar
parents: 13684
diff changeset
773 new_srate = 8000;
d7af73cc38da allow changing playback speed during playback.
reimar
parents: 13684
diff changeset
774 if (new_srate > 192000)
d7af73cc38da allow changing playback speed during playback.
reimar
parents: 13684
diff changeset
775 new_srate = 192000;
d7af73cc38da allow changing playback speed during playback.
reimar
parents: 13684
diff changeset
776 playback_speed = (float)new_srate / (float)sh_audio->samplerate;
d7af73cc38da allow changing playback speed during playback.
reimar
parents: 13684
diff changeset
777 }
d7af73cc38da allow changing playback speed during playback.
reimar
parents: 13684
diff changeset
778 return init_audio_filters(sh_audio, new_srate,
d7af73cc38da allow changing playback speed during playback.
reimar
parents: 13684
diff changeset
779 sh_audio->channels, sh_audio->sample_format, sh_audio->samplesize,
d7af73cc38da allow changing playback speed during playback.
reimar
parents: 13684
diff changeset
780 ao_data->samplerate, ao_data->channels, ao_data->format,
d7af73cc38da allow changing playback speed during playback.
reimar
parents: 13684
diff changeset
781 audio_out_format_bits(ao_data->format) / 8, /* ao_data.bps, */
d7af73cc38da allow changing playback speed during playback.
reimar
parents: 13684
diff changeset
782 ao_data->outburst * 4, ao_data->buffersize);
d7af73cc38da allow changing playback speed during playback.
reimar
parents: 13684
diff changeset
783 }
8800
2485bc98772d fixed some possible overflow places
alex
parents: 8784
diff changeset
784
7201
22beff6edf75 Improved MacOS X SDL support, enable SDL main() wrapper for Darwin, remove unused envp.
atmos4
parents: 7191
diff changeset
785 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
786
723
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
787
12890
9a45f43bf9a0 false-use-of-get_path() memleak fixes.
al
parents: 12841
diff changeset
788 char * mem_ptr;
1289
3f490fad9bdf some code clanup (first step to libdemuxer)
arpi
parents: 1286
diff changeset
789
3f490fad9bdf some code clanup (first step to libdemuxer)
arpi
parents: 1286
diff changeset
790 static demux_stream_t *d_audio=NULL;
3f490fad9bdf some code clanup (first step to libdemuxer)
arpi
parents: 1286
diff changeset
791 static demux_stream_t *d_video=NULL;
3f490fad9bdf some code clanup (first step to libdemuxer)
arpi
parents: 1286
diff changeset
792 static demux_stream_t *d_dvdsub=NULL;
3f490fad9bdf some code clanup (first step to libdemuxer)
arpi
parents: 1286
diff changeset
793
1014
e01dc1a88edf fixed punkso's mess... local variables moved back to main()
arpi_esp
parents: 1009
diff changeset
794 int file_format=DEMUXER_TYPE_UNKNOWN;
4156
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4152
diff changeset
795
1014
e01dc1a88edf fixed punkso's mess... local variables moved back to main()
arpi_esp
parents: 1009
diff changeset
796 int delay_corrected=1;
e01dc1a88edf fixed punkso's mess... local variables moved back to main()
arpi_esp
parents: 1009
diff changeset
797
e01dc1a88edf fixed punkso's mess... local variables moved back to main()
arpi_esp
parents: 1009
diff changeset
798 // movie info:
e01dc1a88edf fixed punkso's mess... local variables moved back to main()
arpi_esp
parents: 1009
diff changeset
799
e01dc1a88edf fixed punkso's mess... local variables moved back to main()
arpi_esp
parents: 1009
diff changeset
800 int osd_function=OSD_PLAY;
e01dc1a88edf fixed punkso's mess... local variables moved back to main()
arpi_esp
parents: 1009
diff changeset
801 int osd_last_pts=-303;
3783
de6b00131e95 show a-v delay in osd (based on subdelay osd patch)
arpi
parents: 3754
diff changeset
802 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
803 int osd_show_text = 0;
13710
d7af73cc38da allow changing playback speed during playback.
reimar
parents: 13684
diff changeset
804 int osd_show_speed = 0;
3234
d1e891c1e548 dusplay sub_delay patch by Evgeny Chukreev <codedj@echo.ru>
arpi
parents: 3201
diff changeset
805 int osd_show_sub_delay = 0;
8366
3e3b30d16719 With this patch the text 'Sub position: x/100' is displayed
arpi
parents: 8365
diff changeset
806 int osd_show_sub_pos = 0;
7628
d6608342591d This patch adds the functionality to disable/enable subtitles while playing
arpi
parents: 7621
diff changeset
807 int osd_show_sub_visibility = 0;
8534
922ce27eb683 This patch adds support for vertical subtitle alignment
arpi
parents: 8531
diff changeset
808 int osd_show_sub_alignment = 0;
7780
9806d65986e4 Mplayer can switch between subtitles of different languages during
kmkaplan
parents: 7751
diff changeset
809 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
810 int osd_show_sub_changed = 0;
8612
a61d1b326beb It shows not just the progressbar, but progressbar /and/ percentage
arpi
parents: 8606
diff changeset
811 int osd_show_percentage = 0;
8627
14ab71b47a58 user friendly channel tuning + 10L fix in tvi_v4l (by Stephane Jourdois)
henry
parents: 8619
diff changeset
812 int osd_show_tv_channel = 25;
11542
85e503ddf65f runtime 'stay-on-top' functionality
joey
parents: 11352
diff changeset
813 int osd_show_ontop = 0;
13091
25f51c72eb06 added runtime toggle of root window playback
joey
parents: 13089
diff changeset
814 int osd_show_rootwin = 0;
11936
0fc4416a0173 Display Framedropping state on the OSD.
diego
parents: 11875
diff changeset
815 int osd_show_framedropping = 0;
1014
e01dc1a88edf fixed punkso's mess... local variables moved back to main()
arpi_esp
parents: 1009
diff changeset
816
2889
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
817 int rtc_fd=-1;
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
818
1369
7a2f1881b776 a_frame, v_frame killed, using sh_audio/video->timer. has_audio not more used after initialization.
arpi
parents: 1353
diff changeset
819 //float a_frame=0; // Audio
1014
e01dc1a88edf fixed punkso's mess... local variables moved back to main()
arpi_esp
parents: 1009
diff changeset
820
e01dc1a88edf fixed punkso's mess... local variables moved back to main()
arpi_esp
parents: 1009
diff changeset
821 int i;
9870
09d630a4f991 support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents: 9831
diff changeset
822 char *tmp;
1014
e01dc1a88edf fixed punkso's mess... local variables moved back to main()
arpi_esp
parents: 1009
diff changeset
823
1787
de6a0987a08d stop fixed, fileselector supp. maybe not work, couldn't test
arpi
parents: 1772
diff changeset
824 int gui_no_filename=0;
de6a0987a08d stop fixed, fileselector supp. maybe not work, couldn't test
arpi
parents: 1772
diff changeset
825
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents: 9593
diff changeset
826
8932
967a1d1f70c6 The following patch adds a call to srand() with the current time at the
arpi
parents: 8925
diff changeset
827 srand((int) time(NULL));
967a1d1f70c6 The following patch adds a call to srand() with the current time at the
arpi
parents: 8925
diff changeset
828
5221
533a58023392 splitted mp_msg_init and mp_msg_set_level
alex
parents: 5217
diff changeset
829 mp_msg_init();
533a58023392 splitted mp_msg_init and mp_msg_set_level
alex
parents: 5217
diff changeset
830 mp_msg_set_level(MSGL_STATUS);
1567
5c7760aa4f94 printf->mp_msg/mp_dbg
arpi
parents: 1564
diff changeset
831
11778
79442082467a Happy new year to all from Argentina :-)
diego
parents: 11767
diff changeset
832 mp_msg(MSGT_CPLAYER,MSGL_INFO, "MPlayer " VERSION " (C) 2000-2004 MPlayer Team\n\n");
2272
c26a9eff0993 cpu detection fixed
arpi
parents: 2265
diff changeset
833 /* Test for cpu capabilities (and corresponding OS support) for optimizing */
9003
c428933c7e54 AltiVec detection code ("borrowed" from FFmpeg and
arpi
parents: 8996
diff changeset
834 GetCpuCaps(&gCpuCaps);
2272
c26a9eff0993 cpu detection fixed
arpi
parents: 2265
diff changeset
835 #ifdef ARCH_X86
6135
53a0e8f92bbd more cpudetect cosmetics
arpi
parents: 6134
diff changeset
836 mp_msg(MSGT_CPLAYER,MSGL_INFO,"CPUflags: MMX: %d MMX2: %d 3DNow: %d 3DNow2: %d SSE: %d SSE2: %d\n",
53a0e8f92bbd more cpudetect cosmetics
arpi
parents: 6134
diff changeset
837 gCpuCaps.hasMMX,gCpuCaps.hasMMX2,
2272
c26a9eff0993 cpu detection fixed
arpi
parents: 2265
diff changeset
838 gCpuCaps.has3DNow, gCpuCaps.has3DNowExt,
c26a9eff0993 cpu detection fixed
arpi
parents: 2265
diff changeset
839 gCpuCaps.hasSSE, gCpuCaps.hasSSE2);
3742
fb8385e6100d print some info on cpu (runtime/compiled flags)
arpi
parents: 3736
diff changeset
840 #ifdef RUNTIME_CPUDETECT
6930
cae1dd6343e7 moved messages to help_mp-??.h
jaf
parents: 6921
diff changeset
841 mp_msg(MSGT_CPLAYER,MSGL_INFO, MSGTR_CompiledWithRuntimeDetection);
3742
fb8385e6100d print some info on cpu (runtime/compiled flags)
arpi
parents: 3736
diff changeset
842 #else
6930
cae1dd6343e7 moved messages to help_mp-??.h
jaf
parents: 6921
diff changeset
843 mp_msg(MSGT_CPLAYER,MSGL_INFO, MSGTR_CompiledWithCPUExtensions);
3742
fb8385e6100d print some info on cpu (runtime/compiled flags)
arpi
parents: 3736
diff changeset
844 #ifdef HAVE_MMX
fb8385e6100d print some info on cpu (runtime/compiled flags)
arpi
parents: 3736
diff changeset
845 mp_msg(MSGT_CPLAYER,MSGL_INFO," MMX");
fb8385e6100d print some info on cpu (runtime/compiled flags)
arpi
parents: 3736
diff changeset
846 #endif
fb8385e6100d print some info on cpu (runtime/compiled flags)
arpi
parents: 3736
diff changeset
847 #ifdef HAVE_MMX2
fb8385e6100d print some info on cpu (runtime/compiled flags)
arpi
parents: 3736
diff changeset
848 mp_msg(MSGT_CPLAYER,MSGL_INFO," MMX2");
fb8385e6100d print some info on cpu (runtime/compiled flags)
arpi
parents: 3736
diff changeset
849 #endif
fb8385e6100d print some info on cpu (runtime/compiled flags)
arpi
parents: 3736
diff changeset
850 #ifdef HAVE_3DNOW
fb8385e6100d print some info on cpu (runtime/compiled flags)
arpi
parents: 3736
diff changeset
851 mp_msg(MSGT_CPLAYER,MSGL_INFO," 3DNow");
fb8385e6100d print some info on cpu (runtime/compiled flags)
arpi
parents: 3736
diff changeset
852 #endif
fb8385e6100d print some info on cpu (runtime/compiled flags)
arpi
parents: 3736
diff changeset
853 #ifdef HAVE_3DNOWEX
fb8385e6100d print some info on cpu (runtime/compiled flags)
arpi
parents: 3736
diff changeset
854 mp_msg(MSGT_CPLAYER,MSGL_INFO," 3DNowEx");
fb8385e6100d print some info on cpu (runtime/compiled flags)
arpi
parents: 3736
diff changeset
855 #endif
fb8385e6100d print some info on cpu (runtime/compiled flags)
arpi
parents: 3736
diff changeset
856 #ifdef HAVE_SSE
fb8385e6100d print some info on cpu (runtime/compiled flags)
arpi
parents: 3736
diff changeset
857 mp_msg(MSGT_CPLAYER,MSGL_INFO," SSE");
fb8385e6100d print some info on cpu (runtime/compiled flags)
arpi
parents: 3736
diff changeset
858 #endif
6135
53a0e8f92bbd more cpudetect cosmetics
arpi
parents: 6134
diff changeset
859 #ifdef HAVE_SSE2
53a0e8f92bbd more cpudetect cosmetics
arpi
parents: 6134
diff changeset
860 mp_msg(MSGT_CPLAYER,MSGL_INFO," SSE2");
53a0e8f92bbd more cpudetect cosmetics
arpi
parents: 6134
diff changeset
861 #endif
53a0e8f92bbd more cpudetect cosmetics
arpi
parents: 6134
diff changeset
862 mp_msg(MSGT_CPLAYER,MSGL_INFO,"\n\n");
3742
fb8385e6100d print some info on cpu (runtime/compiled flags)
arpi
parents: 3736
diff changeset
863 #endif
2272
c26a9eff0993 cpu detection fixed
arpi
parents: 2265
diff changeset
864 #endif
c26a9eff0993 cpu detection fixed
arpi
parents: 2265
diff changeset
865
10646
012f51c6eaa3 dll loading from codecs dir support for windows
faust3
parents: 10609
diff changeset
866 #if defined(WIN32) && defined(USE_WIN32DLL)
012f51c6eaa3 dll loading from codecs dir support for windows
faust3
parents: 10609
diff changeset
867 { /*make our codec dirs available for LoadLibraryA()*/
012f51c6eaa3 dll loading from codecs dir support for windows
faust3
parents: 10609
diff changeset
868 char tmppath[MAX_PATH*2 + 1];
012f51c6eaa3 dll loading from codecs dir support for windows
faust3
parents: 10609
diff changeset
869 char win32path[MAX_PATH];
012f51c6eaa3 dll loading from codecs dir support for windows
faust3
parents: 10609
diff changeset
870 char realpath[MAX_PATH];
012f51c6eaa3 dll loading from codecs dir support for windows
faust3
parents: 10609
diff changeset
871 #ifdef __CYGWIN__
012f51c6eaa3 dll loading from codecs dir support for windows
faust3
parents: 10609
diff changeset
872 cygwin_conv_to_full_win32_path(WIN32_PATH,win32path);
012f51c6eaa3 dll loading from codecs dir support for windows
faust3
parents: 10609
diff changeset
873 strcpy(tmppath,win32path);
012f51c6eaa3 dll loading from codecs dir support for windows
faust3
parents: 10609
diff changeset
874 #ifdef USE_REALCODECS
012f51c6eaa3 dll loading from codecs dir support for windows
faust3
parents: 10609
diff changeset
875 cygwin_conv_to_full_win32_path(REALCODEC_PATH,realpath);
012f51c6eaa3 dll loading from codecs dir support for windows
faust3
parents: 10609
diff changeset
876 sprintf(tmppath,"%s;%s",win32path,realpath);
012f51c6eaa3 dll loading from codecs dir support for windows
faust3
parents: 10609
diff changeset
877 #endif /*USE_REALCODECS*/
012f51c6eaa3 dll loading from codecs dir support for windows
faust3
parents: 10609
diff changeset
878 #else
012f51c6eaa3 dll loading from codecs dir support for windows
faust3
parents: 10609
diff changeset
879 if(!strstr(WIN32_PATH,":")){
012f51c6eaa3 dll loading from codecs dir support for windows
faust3
parents: 10609
diff changeset
880 GetModuleFileNameA(NULL, win32path, MAX_PATH);
012f51c6eaa3 dll loading from codecs dir support for windows
faust3
parents: 10609
diff changeset
881 strcpy(win32path + strlen(win32path) - strlen("mplayer.exe"), WIN32_PATH);
012f51c6eaa3 dll loading from codecs dir support for windows
faust3
parents: 10609
diff changeset
882 }
012f51c6eaa3 dll loading from codecs dir support for windows
faust3
parents: 10609
diff changeset
883 else strcpy(win32path,WIN32_PATH);
012f51c6eaa3 dll loading from codecs dir support for windows
faust3
parents: 10609
diff changeset
884 strcpy(tmppath,win32path);
012f51c6eaa3 dll loading from codecs dir support for windows
faust3
parents: 10609
diff changeset
885 #ifdef USE_REALCODECS
012f51c6eaa3 dll loading from codecs dir support for windows
faust3
parents: 10609
diff changeset
886 if(!strstr(REALCODEC_PATH,":")){
012f51c6eaa3 dll loading from codecs dir support for windows
faust3
parents: 10609
diff changeset
887 GetModuleFileNameA(NULL, realpath, MAX_PATH);
012f51c6eaa3 dll loading from codecs dir support for windows
faust3
parents: 10609
diff changeset
888 strcpy(realpath + strlen(realpath) - strlen("mplayer.exe"), REALCODEC_PATH);
012f51c6eaa3 dll loading from codecs dir support for windows
faust3
parents: 10609
diff changeset
889 }
012f51c6eaa3 dll loading from codecs dir support for windows
faust3
parents: 10609
diff changeset
890 else strcpy(realpath,REALCODEC_PATH);
012f51c6eaa3 dll loading from codecs dir support for windows
faust3
parents: 10609
diff changeset
891 sprintf(tmppath,"%s;%s",win32path,realpath);
012f51c6eaa3 dll loading from codecs dir support for windows
faust3
parents: 10609
diff changeset
892 #endif /*USE_REALCODECS*/
012f51c6eaa3 dll loading from codecs dir support for windows
faust3
parents: 10609
diff changeset
893 #endif /*__CYGWIN__*/
012f51c6eaa3 dll loading from codecs dir support for windows
faust3
parents: 10609
diff changeset
894 SetEnvironmentVariableA("PATH", tmppath);
012f51c6eaa3 dll loading from codecs dir support for windows
faust3
parents: 10609
diff changeset
895 }
012f51c6eaa3 dll loading from codecs dir support for windows
faust3
parents: 10609
diff changeset
896 #endif /*WIN32 && USE_WIN32DLL*/
012f51c6eaa3 dll loading from codecs dir support for windows
faust3
parents: 10609
diff changeset
897
7068
6c2d746b17bf 10l, fix compiling without tv. patch by Andreas Hess <jaska@gmx.net>
arpi
parents: 7058
diff changeset
898 #ifdef USE_TV
5572
8cd761968f35 BSD-BT848 TV update patch by Charles Henrich <henrich@sigbus.com>
arpi
parents: 5520
diff changeset
899 tv_param_immediate = 1;
7068
6c2d746b17bf 10l, fix compiling without tv. patch by Andreas Hess <jaska@gmx.net>
arpi
parents: 7058
diff changeset
900 #endif
5572
8cd761968f35 BSD-BT848 TV update patch by Charles Henrich <henrich@sigbus.com>
arpi
parents: 5520
diff changeset
901
1709
a4e0211455d8 GUI integration, step 1
arpi
parents: 1694
diff changeset
902 if ( argv[0] )
a4e0211455d8 GUI integration, step 1
arpi
parents: 1694
diff changeset
903 if(!strcmp(argv[0],"gmplayer") ||
a4e0211455d8 GUI integration, step 1
arpi
parents: 1694
diff changeset
904 (strrchr(argv[0],'/') && !strcmp(strrchr(argv[0],'/'),"/gmplayer") ) )
a4e0211455d8 GUI integration, step 1
arpi
parents: 1694
diff changeset
905 use_gui=1;
1639
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
906
8164
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents: 8123
diff changeset
907 mconfig = m_config_new();
4156
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4152
diff changeset
908 m_config_register_options(mconfig,mplayer_opts);
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4152
diff changeset
909 // TODO : add something to let modules register their options
7867
3dc0b71630ff cleanup config option handling in libmpdemux.
arpi
parents: 7864
diff changeset
910 mp_input_register_options(mconfig);
4156
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4152
diff changeset
911 parse_cfgfiles(mconfig);
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4152
diff changeset
912
7019
e37a67d5e117 fix (?) cmd line handling
pontscho
parents: 7009
diff changeset
913 #ifdef HAVE_NEW_GUI
e37a67d5e117 fix (?) cmd line handling
pontscho
parents: 7009
diff changeset
914 if ( use_gui ) cfg_read();
e37a67d5e117 fix (?) cmd line handling
pontscho
parents: 7009
diff changeset
915 #endif
4156
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4152
diff changeset
916
8164
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents: 8123
diff changeset
917 playtree = m_config_parse_mp_command_line(mconfig, argc, argv);
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents: 8123
diff changeset
918 if(playtree == NULL)
13500
77b3bc17d764 make sure exit_player gets called
joey
parents: 13391
diff changeset
919 exit_player(NULL);
4156
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4152
diff changeset
920
4045
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
921 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
922 if(playtree) {
4156
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4152
diff changeset
923 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
924 if(playtree_iter) {
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
925 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
926 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
927 playtree_iter = NULL;
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
928 }
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
929 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
930 }
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
931 }
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
932
1709
a4e0211455d8 GUI integration, step 1
arpi
parents: 1694
diff changeset
933 #ifndef HAVE_NEW_GUI
a4e0211455d8 GUI integration, step 1
arpi
parents: 1694
diff changeset
934 if(use_gui){
1973
5216f108cb4f all error/warn/info messages moved to help_mp-en.h for translation
arpi
parents: 1962
diff changeset
935 mp_msg(MSGT_CPLAYER,MSGL_WARN,MSGTR_NoGui);
1709
a4e0211455d8 GUI integration, step 1
arpi
parents: 1694
diff changeset
936 use_gui=0;
a4e0211455d8 GUI integration, step 1
arpi
parents: 1694
diff changeset
937 }
1723
5e4214a7540e GUI stuff. now seeking works, and xmga renders to video window
arpi
parents: 1709
diff changeset
938 #else
5e4214a7540e GUI stuff. now seeking works, and xmga renders to video window
arpi
parents: 1709
diff changeset
939 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
940 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
941 use_gui=0;
5e4214a7540e GUI stuff. now seeking works, and xmga renders to video window
arpi
parents: 1709
diff changeset
942 }
9291
64b8c5a07c2c - It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents: 9217
diff changeset
943 if (use_gui && playtree_iter){
9319
arpi
parents: 9318
diff changeset
944 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
945 // 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
946 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
947 playtree_iter=NULL;
9301
7841308ad250 this patch fixes latest bug, discovered by .so ... (relative filenames &
arpi
parents: 9291
diff changeset
948
9318
51a9af80d874 PATH_MAX should be more portable, and we even include limits.h to be sure
arpi
parents: 9317
diff changeset
949 if (getcwd(cwd, PATH_MAX) != (char *)NULL)
9301
7841308ad250 this patch fixes latest bug, discovered by .so ... (relative filenames &
arpi
parents: 9291
diff changeset
950 {
7841308ad250 this patch fixes latest bug, discovered by .so ... (relative filenames &
arpi
parents: 9291
diff changeset
951 strcat(cwd, "/");
7841308ad250 this patch fixes latest bug, discovered by .so ... (relative filenames &
arpi
parents: 9291
diff changeset
952 // Prefix relative paths with current working directory
7841308ad250 this patch fixes latest bug, discovered by .so ... (relative filenames &
arpi
parents: 9291
diff changeset
953 play_tree_add_bpf(playtree, cwd);
7841308ad250 this patch fixes latest bug, discovered by .so ... (relative filenames &
arpi
parents: 9291
diff changeset
954 }
9291
64b8c5a07c2c - It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents: 9217
diff changeset
955 // 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
956 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
957 }
1709
a4e0211455d8 GUI integration, step 1
arpi
parents: 1694
diff changeset
958 #endif
a4e0211455d8 GUI integration, step 1
arpi
parents: 1694
diff changeset
959
7562
92188b57a062 video out driver list support (like -vc, example: -vo xmga,xv,x11,)
arpi
parents: 7559
diff changeset
960 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
961 list_video_out();
13500
77b3bc17d764 make sure exit_player gets called
joey
parents: 13391
diff changeset
962 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
963 }
5072
a760c9f074df libvo2 #ifs removed
arpi
parents: 5055
diff changeset
964
7563
e9e4398029de audio out driver list support (example: -ao alsa9,sdl:esd,oss,sdl:oss,)
arpi
parents: 7562
diff changeset
965 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
966 list_audio_out();
13500
77b3bc17d764 make sure exit_player gets called
joey
parents: 13391
diff changeset
967 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
968 }
1639
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
969
1983
72f0648df475 -ac help / -vc help
arpi
parents: 1973
diff changeset
970 // check codec.conf
11759
29eea271490e add -codecs-file for selecting a specific codecs.conf on the comand line
attila
parents: 11592
diff changeset
971 if(!codecs_file || !parse_codec_cfg(codecs_file)){
12890
9a45f43bf9a0 false-use-of-get_path() memleak fixes.
al
parents: 12841
diff changeset
972 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
973 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
974 if(!parse_codec_cfg(NULL)){
29eea271490e add -codecs-file for selecting a specific codecs.conf on the comand line
attila
parents: 11592
diff changeset
975 mp_msg(MSGT_CPLAYER,MSGL_HINT,MSGTR_CopyCodecsConf);
13500
77b3bc17d764 make sure exit_player gets called
joey
parents: 13391
diff changeset
976 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
977 }
29eea271490e add -codecs-file for selecting a specific codecs.conf on the comand line
attila
parents: 11592
diff changeset
978 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
979 }
1983
72f0648df475 -ac help / -vc help
arpi
parents: 1973
diff changeset
980 }
12890
9a45f43bf9a0 false-use-of-get_path() memleak fixes.
al
parents: 12841
diff changeset
981 free( mem_ptr ); // release the buffer created by get_path()
1983
72f0648df475 -ac help / -vc help
arpi
parents: 1973
diff changeset
982 }
72f0648df475 -ac help / -vc help
arpi
parents: 1973
diff changeset
983
7506
c1cb94198e05 -vc/-vfm accepts codec/driver _list_ now. empty list element for -vc means
arpi
parents: 7502
diff changeset
984 #if 0
c1cb94198e05 -vc/-vfm accepts codec/driver _list_ now. empty list element for -vc means
arpi
parents: 7502
diff changeset
985 if(video_codec_list){
c1cb94198e05 -vc/-vfm accepts codec/driver _list_ now. empty list element for -vc means
arpi
parents: 7502
diff changeset
986 int i;
c1cb94198e05 -vc/-vfm accepts codec/driver _list_ now. empty list element for -vc means
arpi
parents: 7502
diff changeset
987 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
988 for(i=0;video_codec_list[i];i++)
13577
606d90e03a2f printf --> mp_msg conversion
diego
parents: 13502
diff changeset
989 mp_msg(MSGT_FIXME,MSGL_FIXME,"vc#%d: '%s'\n",i,video_codec_list[i]);
7506
c1cb94198e05 -vc/-vfm accepts codec/driver _list_ now. empty list element for -vc means
arpi
parents: 7502
diff changeset
990 }
c1cb94198e05 -vc/-vfm accepts codec/driver _list_ now. empty list element for -vc means
arpi
parents: 7502
diff changeset
991 #endif
7522
aa1a1249f239 -ac/-afm rewrite, now works the same way as -vc/-vfm
arpi
parents: 7517
diff changeset
992 if(audio_codec_list && strcmp(audio_codec_list[0],"help")==0){
6930
cae1dd6343e7 moved messages to help_mp-??.h
jaf
parents: 6921
diff changeset
993 mp_msg(MSGT_CPLAYER, MSGL_INFO, MSGTR_AvailableAudioCodecs);
1983
72f0648df475 -ac help / -vc help
arpi
parents: 1973
diff changeset
994 list_codecs(1);
13577
606d90e03a2f printf --> mp_msg conversion
diego
parents: 13502
diff changeset
995 mp_msg(MSGT_FIXME, MSGL_FIXME, "\n");
13500
77b3bc17d764 make sure exit_player gets called
joey
parents: 13391
diff changeset
996 exit_player_with_rc(NULL, 0);
1983
72f0648df475 -ac help / -vc help
arpi
parents: 1973
diff changeset
997 }
7506
c1cb94198e05 -vc/-vfm accepts codec/driver _list_ now. empty list element for -vc means
arpi
parents: 7502
diff changeset
998 if(video_codec_list && strcmp(video_codec_list[0],"help")==0){
6930
cae1dd6343e7 moved messages to help_mp-??.h
jaf
parents: 6921
diff changeset
999 mp_msg(MSGT_CPLAYER, MSGL_INFO, MSGTR_AvailableVideoCodecs);
1983
72f0648df475 -ac help / -vc help
arpi
parents: 1973
diff changeset
1000 list_codecs(0);
13577
606d90e03a2f printf --> mp_msg conversion
diego
parents: 13502
diff changeset
1001 mp_msg(MSGT_FIXME, MSGL_FIXME, "\n");
13500
77b3bc17d764 make sure exit_player gets called
joey
parents: 13391
diff changeset
1002 exit_player_with_rc(NULL, 0);
1983
72f0648df475 -ac help / -vc help
arpi
parents: 1973
diff changeset
1003 }
7506
c1cb94198e05 -vc/-vfm accepts codec/driver _list_ now. empty list element for -vc means
arpi
parents: 7502
diff changeset
1004 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
1005 vfm_help();
13577
606d90e03a2f printf --> mp_msg conversion
diego
parents: 13502
diff changeset
1006 mp_msg(MSGT_FIXME, MSGL_FIXME, "\n");
13500
77b3bc17d764 make sure exit_player gets called
joey
parents: 13391
diff changeset
1007 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
1008 }
7522
aa1a1249f239 -ac/-afm rewrite, now works the same way as -vc/-vfm
arpi
parents: 7517
diff changeset
1009 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
1010 afm_help();
13577
606d90e03a2f printf --> mp_msg conversion
diego
parents: 13502
diff changeset
1011 mp_msg(MSGT_FIXME, MSGL_FIXME, "\n");
13500
77b3bc17d764 make sure exit_player gets called
joey
parents: 13391
diff changeset
1012 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
1013 }
13269
aa13937da8a0 mplayer -af help now lists all available audio filters.
ivo
parents: 13228
diff changeset
1014 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
1015 af_help();
aa13937da8a0 mplayer -af help now lists all available audio filters.
ivo
parents: 13228
diff changeset
1016 printf("\n");
13500
77b3bc17d764 make sure exit_player gets called
joey
parents: 13391
diff changeset
1017 exit_player_with_rc(NULL, 0);
13269
aa13937da8a0 mplayer -af help now lists all available audio filters.
ivo
parents: 13228
diff changeset
1018 }
9336
4d39aa85a723 Forgot about #ifdef HAVE_X11. 10l
filon
parents: 9319
diff changeset
1019 #ifdef HAVE_X11
9317
c7f5df43b937 - support command line parameter -fstype, eg. -fstype layer=12,above,fullscreen
filon
parents: 9315
diff changeset
1020 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
1021 fstype_help();
13577
606d90e03a2f printf --> mp_msg conversion
diego
parents: 13502
diff changeset
1022 mp_msg(MSGT_FIXME, MSGL_FIXME, "\n");
13500
77b3bc17d764 make sure exit_player gets called
joey
parents: 13391
diff changeset
1023 exit_player_with_rc(NULL, 0);
9317
c7f5df43b937 - support command line parameter -fstype, eg. -fstype layer=12,above,fullscreen
filon
parents: 9315
diff changeset
1024 }
9336
4d39aa85a723 Forgot about #ifdef HAVE_X11. 10l
filon
parents: 9319
diff changeset
1025 #endif
1983
72f0648df475 -ac help / -vc help
arpi
parents: 1973
diff changeset
1026
8531
1aa2c9b460af Merged EDL 0.5 patch - it's something like Quicktime's edit lists.
arpi
parents: 8494
diff changeset
1027 #ifdef USE_EDL
13168
ce046ef860da EDL enhancement/fixes:
rtognimp
parents: 13132
diff changeset
1028 if (edl_check_mode() == EDL_ERROR && edl_filename)
ce046ef860da EDL enhancement/fixes:
rtognimp
parents: 13132
diff changeset
1029 {
13358
567875b88aab Hardcoded EDL messages moved to help_mp-en.h, Doxygen comments added, patch
diego
parents: 13353
diff changeset
1030 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
1031 exit_player(NULL);
13168
ce046ef860da EDL enhancement/fixes:
rtognimp
parents: 13132
diff changeset
1032 } else if (edl_filename)
ce046ef860da EDL enhancement/fixes:
rtognimp
parents: 13132
diff changeset
1033 {
ce046ef860da EDL enhancement/fixes:
rtognimp
parents: 13132
diff changeset
1034 edl_memory_slots = edl_count_entries();
ce046ef860da EDL enhancement/fixes:
rtognimp
parents: 13132
diff changeset
1035 if (edl_memory_slots > 0)
ce046ef860da EDL enhancement/fixes:
rtognimp
parents: 13132
diff changeset
1036 {
ce046ef860da EDL enhancement/fixes:
rtognimp
parents: 13132
diff changeset
1037 edl_records = calloc(edl_memory_slots, sizeof(struct edl_record));
ce046ef860da EDL enhancement/fixes:
rtognimp
parents: 13132
diff changeset
1038 if (edl_records == NULL)
ce046ef860da EDL enhancement/fixes:
rtognimp
parents: 13132
diff changeset
1039 {
13358
567875b88aab Hardcoded EDL messages moved to help_mp-en.h, Doxygen comments added, patch
diego
parents: 13353
diff changeset
1040 mp_msg(MSGT_CPLAYER, MSGL_FATAL, MSGTR_EdlOutOfMem);
13168
ce046ef860da EDL enhancement/fixes:
rtognimp
parents: 13132
diff changeset
1041 exit_player(NULL);
ce046ef860da EDL enhancement/fixes:
rtognimp
parents: 13132
diff changeset
1042 } else
ce046ef860da EDL enhancement/fixes:
rtognimp
parents: 13132
diff changeset
1043 {
ce046ef860da EDL enhancement/fixes:
rtognimp
parents: 13132
diff changeset
1044 if ((edl_operations = edl_parse_file(edl_records)) > 0)
ce046ef860da EDL enhancement/fixes:
rtognimp
parents: 13132
diff changeset
1045 {
13358
567875b88aab Hardcoded EDL messages moved to help_mp-en.h, Doxygen comments added, patch
diego
parents: 13353
diff changeset
1046 mp_msg(MSGT_CPLAYER, MSGL_INFO, MSGTR_EdlRecordsNo,
13168
ce046ef860da EDL enhancement/fixes:
rtognimp
parents: 13132
diff changeset
1047 edl_operations);
ce046ef860da EDL enhancement/fixes:
rtognimp
parents: 13132
diff changeset
1048 } else
ce046ef860da EDL enhancement/fixes:
rtognimp
parents: 13132
diff changeset
1049 {
ce046ef860da EDL enhancement/fixes:
rtognimp
parents: 13132
diff changeset
1050
13358
567875b88aab Hardcoded EDL messages moved to help_mp-en.h, Doxygen comments added, patch
diego
parents: 13353
diff changeset
1051 mp_msg(MSGT_CPLAYER, MSGL_INFO, MSGTR_EdlQueueEmpty);
13168
ce046ef860da EDL enhancement/fixes:
rtognimp
parents: 13132
diff changeset
1052 }
ce046ef860da EDL enhancement/fixes:
rtognimp
parents: 13132
diff changeset
1053 }
ce046ef860da EDL enhancement/fixes:
rtognimp
parents: 13132
diff changeset
1054 }
ce046ef860da EDL enhancement/fixes:
rtognimp
parents: 13132
diff changeset
1055
ce046ef860da EDL enhancement/fixes:
rtognimp
parents: 13132
diff changeset
1056 next_edl_record = edl_records;
ce046ef860da EDL enhancement/fixes:
rtognimp
parents: 13132
diff changeset
1057
ce046ef860da EDL enhancement/fixes:
rtognimp
parents: 13132
diff changeset
1058 } else if (edl_output_filename)
ce046ef860da EDL enhancement/fixes:
rtognimp
parents: 13132
diff changeset
1059 {
ce046ef860da EDL enhancement/fixes:
rtognimp
parents: 13132
diff changeset
1060 if ((edl_fd = fopen(edl_output_filename, "w")) == NULL)
ce046ef860da EDL enhancement/fixes:
rtognimp
parents: 13132
diff changeset
1061 {
13358
567875b88aab Hardcoded EDL messages moved to help_mp-en.h, Doxygen comments added, patch
diego
parents: 13353
diff changeset
1062 mp_msg(MSGT_CPLAYER, MSGL_ERR, MSGTR_EdlCantOpenForWrite,
13168
ce046ef860da EDL enhancement/fixes:
rtognimp
parents: 13132
diff changeset
1063 edl_output_filename);
13358
567875b88aab Hardcoded EDL messages moved to help_mp-en.h, Doxygen comments added, patch
diego
parents: 13353
diff changeset
1064 exit_player(NULL);
13168
ce046ef860da EDL enhancement/fixes:
rtognimp
parents: 13132
diff changeset
1065 }
ce046ef860da EDL enhancement/fixes:
rtognimp
parents: 13132
diff changeset
1066 }
8531
1aa2c9b460af Merged EDL 0.5 patch - it's something like Quicktime's edit lists.
arpi
parents: 8494
diff changeset
1067 #endif
1983
72f0648df475 -ac help / -vc help
arpi
parents: 1973
diff changeset
1068
9752
3db72324a0fe Stream cleanup, don't use blah_on options anymore.
albeu
parents: 9695
diff changeset
1069 if(!filename){
1787
de6a0987a08d stop fixed, fileselector supp. maybe not work, couldn't test
arpi
parents: 1772
diff changeset
1070 if(!use_gui){
1690
09f9297d2ee6 -vo help fixed
arpi
parents: 1674
diff changeset
1071 // no file/vcd/dvd -> show HELP:
5112
70fb281bb13c changed printf's to mp_msg
alex
parents: 5106
diff changeset
1072 mp_msg(MSGT_CPLAYER, MSGL_INFO, help_text);
13500
77b3bc17d764 make sure exit_player gets called
joey
parents: 13391
diff changeset
1073 exit_player_with_rc(NULL, 0);
1787
de6a0987a08d stop fixed, fileselector supp. maybe not work, couldn't test
arpi
parents: 1772
diff changeset
1074 } else gui_no_filename=1;
1690
09f9297d2ee6 -vo help fixed
arpi
parents: 1674
diff changeset
1075 }
09f9297d2ee6 -vo help fixed
arpi
parents: 1674
diff changeset
1076
09f9297d2ee6 -vo help fixed
arpi
parents: 1674
diff changeset
1077 // Many users forget to include command line in bugreports...
8027
b9da278e4c92 verbose can be negative
arpi
parents: 8023
diff changeset
1078 if(verbose>0){
13577
606d90e03a2f printf --> mp_msg conversion
diego
parents: 13502
diff changeset
1079 mp_msg(MSGT_CPLAYER, MSGL_INFO, MSGTR_CommandLine);
606d90e03a2f printf --> mp_msg conversion
diego
parents: 13502
diff changeset
1080 for(i=1;i<argc;i++)mp_msg(MSGT_FIXME, MSGL_FIXME," '%s'",argv[i]);
606d90e03a2f printf --> mp_msg conversion
diego
parents: 13502
diff changeset
1081 mp_msg(MSGT_FIXME, MSGL_FIXME, "\n");
1690
09f9297d2ee6 -vo help fixed
arpi
parents: 1674
diff changeset
1082 }
09f9297d2ee6 -vo help fixed
arpi
parents: 1674
diff changeset
1083
5221
533a58023392 splitted mp_msg_init and mp_msg_set_level
alex
parents: 5217
diff changeset
1084 mp_msg_set_level(verbose+MSGL_STATUS);
1183
6fbcfe7f7f10 vo/ao_subdevice implemented
al3x
parents: 1177
diff changeset
1085
1639
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
1086 //------ load global data first ------
955
3a3304cd9fd5 libao support
arpi_esp
parents: 940
diff changeset
1087
11580
90953d955165 Fontconfig support based on patch by Arwed von Merkatz <v.merkatz@gmx.net>, but slightly reworked
alex
parents: 11542
diff changeset
1088 // check font
7122
0dc9cb756b68 freetype 2.0/2.1+ support - disabled by default until bugs fixed
arpi
parents: 7111
diff changeset
1089 #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
1090 #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
1091 init_freetype();
90953d955165 Fontconfig support based on patch by Arwed von Merkatz <v.merkatz@gmx.net>, but slightly reworked
alex
parents: 11542
diff changeset
1092 #endif
90953d955165 Fontconfig support based on patch by Arwed von Merkatz <v.merkatz@gmx.net>, but slightly reworked
alex
parents: 11542
diff changeset
1093 #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
1094 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
1095 {
90953d955165 Fontconfig support based on patch by Arwed von Merkatz <v.merkatz@gmx.net>, but slightly reworked
alex
parents: 11542
diff changeset
1096 #endif
212
7034ef1f685d new option: -font
arpi_esp
parents: 208
diff changeset
1097 if(font_name){
337
3ca0b1b739a5 changed fs+vm+zoom flags for libvo
arpi_esp
parents: 332
diff changeset
1098 vo_font=read_font_desc(font_name,font_factor,verbose>1);
1582
12aa68bf2ff5 erros emssages moved to help_mp.h for translation
arpi
parents: 1567
diff changeset
1099 if(!vo_font) mp_msg(MSGT_CPLAYER,MSGL_ERR,MSGTR_CantLoadFont,font_name);
220
5348fa1313fe OSD functionality improved
arpi_esp
parents: 215
diff changeset
1100 } else {
5348fa1313fe OSD functionality improved
arpi_esp
parents: 215
diff changeset
1101 // try default:
12890
9a45f43bf9a0 false-use-of-get_path() memleak fixes.
al
parents: 12841
diff changeset
1102 vo_font=read_font_desc( mem_ptr=get_path("font/font.desc"),font_factor,verbose>1);
9a45f43bf9a0 false-use-of-get_path() memleak fixes.
al
parents: 12841
diff changeset
1103 free(mem_ptr); // release the buffer created by get_path()
1353
c3e3b0ae4d06 Applied DATADIR patch by Vladimir Kushnir
arpi
parents: 1338
diff changeset
1104 if(!vo_font)
10272
7b0bc557987b renames: DATADIR->MPLAYER_DATADIR, CONFDIR->MPLAYER_CONFDIR, LIBDIR->MPLAYER_LIBDIR
arpi
parents: 10240
diff changeset
1105 vo_font=read_font_desc(MPLAYER_DATADIR "/font/font.desc",font_factor,verbose>1);
212
7034ef1f685d new option: -font
arpi_esp
parents: 208
diff changeset
1106 }
11580
90953d955165 Fontconfig support based on patch by Arwed von Merkatz <v.merkatz@gmx.net>, but slightly reworked
alex
parents: 11542
diff changeset
1107 #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
1108 }
1422
d02e0dcaf077 libvo2 support
arpi
parents: 1421
diff changeset
1109 #endif
7122
0dc9cb756b68 freetype 2.0/2.1+ support - disabled by default until bugs fixed
arpi
parents: 7111
diff changeset
1110 #endif
5638
86663f1b9b00 new osd code, use osd objs to follow changes and do minimal updates
arpi
parents: 5627
diff changeset
1111 vo_init_osd();
86663f1b9b00 new osd code, use osd objs to follow changes and do minimal updates
arpi
parents: 5627
diff changeset
1112
3015
8bf21c807656 RTC is autodetected
arpi
parents: 2941
diff changeset
1113 #ifdef HAVE_RTC
5055
534167719e91 nortc patch by Attila Kinali
atmos4
parents: 5046
diff changeset
1114 if(!nortc)
534167719e91 nortc patch by Attila Kinali
atmos4
parents: 5046
diff changeset
1115 {
7494
229287c14cd4 RTC fixes by Sidik Isani <lksi@cfht.hawaii.edu>
arpi
parents: 7486
diff changeset
1116 // seteuid(0); /* Can't hurt to try to get root here */
12681
6d815f12e3e5 rtc-device cmd option by James Noble
alex
parents: 12672
diff changeset
1117 if ((rtc_fd = open(rtc_device ? rtc_device : "/dev/rtc", O_RDONLY)) < 0)
13577
606d90e03a2f printf --> mp_msg conversion
diego
parents: 13502
diff changeset
1118 mp_msg(MSGT_CPLAYER, MSGL_WARN, MSGTR_RTCDeviceNotOpenable,
12681
6d815f12e3e5 rtc-device cmd option by James Noble
alex
parents: 12672
diff changeset
1119 rtc_device ? rtc_device : "/dev/rtc", strerror(errno));
7494
229287c14cd4 RTC fixes by Sidik Isani <lksi@cfht.hawaii.edu>
arpi
parents: 7486
diff changeset
1120 else {
229287c14cd4 RTC fixes by Sidik Isani <lksi@cfht.hawaii.edu>
arpi
parents: 7486
diff changeset
1121 unsigned long irqp = 1024; /* 512 seemed OK. 128 is jerky. */
229287c14cd4 RTC fixes by Sidik Isani <lksi@cfht.hawaii.edu>
arpi
parents: 7486
diff changeset
1122
229287c14cd4 RTC fixes by Sidik Isani <lksi@cfht.hawaii.edu>
arpi
parents: 7486
diff changeset
1123 if (ioctl(rtc_fd, RTC_IRQP_SET, irqp) < 0) {
13577
606d90e03a2f printf --> mp_msg conversion
diego
parents: 13502
diff changeset
1124 mp_msg(MSGT_CPLAYER, MSGL_WARN, MSGTR_LinuxRTCInitErrorIrqpSet, irqp, strerror(errno));
606d90e03a2f printf --> mp_msg conversion
diego
parents: 13502
diff changeset
1125 mp_msg(MSGT_CPLAYER, MSGL_HINT, MSGTR_IncreaseRTCMaxUserFreq, irqp);
7494
229287c14cd4 RTC fixes by Sidik Isani <lksi@cfht.hawaii.edu>
arpi
parents: 7486
diff changeset
1126 close (rtc_fd);
2889
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
1127 rtc_fd = -1;
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
1128 } 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
1129 /* variable only by the root */
13577
606d90e03a2f printf --> mp_msg conversion
diego
parents: 13502
diff changeset
1130 mp_msg(MSGT_CPLAYER, MSGL_ERR, MSGTR_LinuxRTCInitErrorPieOn, strerror(errno));
2889
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
1131 close (rtc_fd);
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
1132 rtc_fd = -1;
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
1133 } else
6930
cae1dd6343e7 moved messages to help_mp-??.h
jaf
parents: 6921
diff changeset
1134 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
1135 }
5055
534167719e91 nortc patch by Attila Kinali
atmos4
parents: 5046
diff changeset
1136 }
4176
116abdd0aed1 small gtk bug fix (-display bug, baze gabu, miattad fogok elkarhozni:), and remove gui dependencie in mencoder
pontscho
parents: 4160
diff changeset
1137 #ifdef HAVE_NEW_GUI
3825
7735c5a87121 setuid hack disabled
arpi
parents: 3823
diff changeset
1138 // 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
1139 // 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
1140 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
1141 #endif
2889
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
1142 if(rtc_fd<0)
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
1143 #endif
12954
f9755d9c479a Native darwin timer update.
wight
parents: 12893
diff changeset
1144 mp_msg(MSGT_CPLAYER, MSGL_INFO, "Using %s timing\n",
f9755d9c479a Native darwin timer update.
wight
parents: 12893
diff changeset
1145 softsleep?"software":timer_name);
2889
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
1146
1639
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
1147 #ifdef USE_TERMCAP
3618
772729dd7b40 better dvd support
pontscho
parents: 3597
diff changeset
1148 if ( !use_gui ) load_termcap(NULL); // load key-codes
1639
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
1149 #endif
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
1150
1816
c8bc613eb4f8 fixed 'n' key bug :)
arpi
parents: 1809
diff changeset
1151 // ========== Init keyboard FIFO (connection to libvo) ============
1694
0def229bd8bc GUI support (--enable-gui)
arpi
parents: 1690
diff changeset
1152
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
1153 // Init input system
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
1154 current_module = "init_input";
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
1155 mp_input_init();
9831
0397b461f0fb MINGW32 port and select()less fifocode by Arpi
faust3
parents: 9752
diff changeset
1156 #ifndef HAVE_NO_POSIX_SELECT
0397b461f0fb MINGW32 port and select()less fifocode by Arpi
faust3
parents: 9752
diff changeset
1157 make_pipe(&keyb_fifo_get,&keyb_fifo_put);
0397b461f0fb MINGW32 port and select()less fifocode by Arpi
faust3
parents: 9752
diff changeset
1158
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
1159 if(keyb_fifo_get > 0)
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
1160 mp_input_add_key_fd(keyb_fifo_get,1,NULL,NULL);
9831
0397b461f0fb MINGW32 port and select()less fifocode by Arpi
faust3
parents: 9752
diff changeset
1161 #else
0397b461f0fb MINGW32 port and select()less fifocode by Arpi
faust3
parents: 9752
diff changeset
1162 mp_input_add_key_fd(-1,0,mplayer_get_key,NULL);
0397b461f0fb MINGW32 port and select()less fifocode by Arpi
faust3
parents: 9752
diff changeset
1163 #endif
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
1164 if(slave_mode)
10928
f2313bd91594 add a read function for slave mode on mingw
faust3
parents: 10917
diff changeset
1165 #ifndef __MINGW32__
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
1166 mp_input_add_cmd_fd(0,1,NULL,NULL);
10928
f2313bd91594 add a read function for slave mode on mingw
faust3
parents: 10917
diff changeset
1167 #else
f2313bd91594 add a read function for slave mode on mingw
faust3
parents: 10917
diff changeset
1168 mp_input_add_cmd_fd(0,0,mp_input_win32_slave_cmd_func,NULL);
f2313bd91594 add a read function for slave mode on mingw
faust3
parents: 10917
diff changeset
1169 #endif
12816
fba780800efe -use-stdin renamed to -noconsolecontrols.
diego
parents: 12753
diff changeset
1170 else if(!noconsolecontrols)
9831
0397b461f0fb MINGW32 port and select()less fifocode by Arpi
faust3
parents: 9752
diff changeset
1171 #ifndef HAVE_NO_POSIX_SELECT
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
1172 mp_input_add_key_fd(0,1,NULL,NULL);
9831
0397b461f0fb MINGW32 port and select()less fifocode by Arpi
faust3
parents: 9752
diff changeset
1173 #else
0397b461f0fb MINGW32 port and select()less fifocode by Arpi
faust3
parents: 9752
diff changeset
1174 mp_input_add_key_fd(0,0,NULL,NULL);
0397b461f0fb MINGW32 port and select()less fifocode by Arpi
faust3
parents: 9752
diff changeset
1175 #endif
0397b461f0fb MINGW32 port and select()less fifocode by Arpi
faust3
parents: 9752
diff changeset
1176
4431
44c23fd75005 Added uninit to input
albeu
parents: 4418
diff changeset
1177 inited_flags|=INITED_INPUT;
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
1178 current_module = NULL;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
1179
8198
1935017c0f71 Experimantal OSD menu
albeu
parents: 8164
diff changeset
1180 #ifdef HAVE_MENU
1935017c0f71 Experimantal OSD menu
albeu
parents: 8164
diff changeset
1181 if(use_menu) {
8723
48a2c2545d5c Use system-wide menu.conf file if nothing else is availible,
filon
parents: 8672
diff changeset
1182 if(menu_cfg && menu_init(menu_cfg))
13577
606d90e03a2f printf --> mp_msg conversion
diego
parents: 13502
diff changeset
1183 mp_msg(MSGT_CPLAYER,MSGL_INFO,MSGTR_MenuInitialized, menu_cfg);
8198
1935017c0f71 Experimantal OSD menu
albeu
parents: 8164
diff changeset
1184 else {
8723
48a2c2545d5c Use system-wide menu.conf file if nothing else is availible,
filon
parents: 8672
diff changeset
1185 menu_cfg = get_path("menu.conf");
48a2c2545d5c Use system-wide menu.conf file if nothing else is availible,
filon
parents: 8672
diff changeset
1186 if(menu_init(menu_cfg))
13577
606d90e03a2f printf --> mp_msg conversion
diego
parents: 13502
diff changeset
1187 mp_msg(MSGT_CPLAYER,MSGL_INFO,MSGTR_MenuInitialized, menu_cfg);
8723
48a2c2545d5c Use system-wide menu.conf file if nothing else is availible,
filon
parents: 8672
diff changeset
1188 else {
10272
7b0bc557987b renames: DATADIR->MPLAYER_DATADIR, CONFDIR->MPLAYER_CONFDIR, LIBDIR->MPLAYER_LIBDIR
arpi
parents: 10240
diff changeset
1189 if(menu_init(MPLAYER_CONFDIR "/menu.conf"))
13577
606d90e03a2f printf --> mp_msg conversion
diego
parents: 13502
diff changeset
1190 mp_msg(MSGT_CPLAYER,MSGL_INFO,MSGTR_MenuInitialized, MPLAYER_CONFDIR"/menu.conf");
8723
48a2c2545d5c Use system-wide menu.conf file if nothing else is availible,
filon
parents: 8672
diff changeset
1191 else {
13577
606d90e03a2f printf --> mp_msg conversion
diego
parents: 13502
diff changeset
1192 mp_msg(MSGT_CPLAYER,MSGL_INFO,MSGTR_MenuInitFailed);
8723
48a2c2545d5c Use system-wide menu.conf file if nothing else is availible,
filon
parents: 8672
diff changeset
1193 use_menu = 0;
48a2c2545d5c Use system-wide menu.conf file if nothing else is availible,
filon
parents: 8672
diff changeset
1194 }
48a2c2545d5c Use system-wide menu.conf file if nothing else is availible,
filon
parents: 8672
diff changeset
1195 }
8198
1935017c0f71 Experimantal OSD menu
albeu
parents: 8164
diff changeset
1196 }
1935017c0f71 Experimantal OSD menu
albeu
parents: 8164
diff changeset
1197 }
1935017c0f71 Experimantal OSD menu
albeu
parents: 8164
diff changeset
1198 #endif
1935017c0f71 Experimantal OSD menu
albeu
parents: 8164
diff changeset
1199
13391
b6c3752d9544 handle sigchld in mplayer.c
faust3
parents: 13358
diff changeset
1200 /// Catch signals
b6c3752d9544 handle sigchld in mplayer.c
faust3
parents: 13358
diff changeset
1201 #ifndef __MINGW32__
b6c3752d9544 handle sigchld in mplayer.c
faust3
parents: 13358
diff changeset
1202 signal(SIGCHLD,child_sighandler);
b6c3752d9544 handle sigchld in mplayer.c
faust3
parents: 13358
diff changeset
1203 #endif
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
1204
1639
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
1205 //========= Catch terminate signals: ================
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
1206 // terminate requests:
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
1207 signal(SIGTERM,exit_sighandler); // kill
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
1208 signal(SIGHUP,exit_sighandler); // kill -HUP / xterm closed
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
1209
1729
d6c99f70449e fix hprogressbar
pontscho
parents: 1727
diff changeset
1210 signal(SIGINT,exit_sighandler); // Interrupt from keyboard
1639
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
1211
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
1212 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
1213 #ifdef ENABLE_SIGHANDLER
1639
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
1214 // fatal errors:
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
1215 signal(SIGBUS,exit_sighandler); // bus error
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
1216 signal(SIGSEGV,exit_sighandler); // segfault
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
1217 signal(SIGILL,exit_sighandler); // illegal instruction
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
1218 signal(SIGFPE,exit_sighandler); // floating point exc.
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
1219 signal(SIGABRT,exit_sighandler); // abort()
5367
658ea5d7316a Allow to disable crasj sighandler to enable creation of coredump files.
atmos4
parents: 5326
diff changeset
1220 #endif
1639
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
1221
4963
13262bd21965 small changes
pontscho
parents: 4950
diff changeset
1222 #ifdef HAVE_NEW_GUI
13262bd21965 small changes
pontscho
parents: 4950
diff changeset
1223 if(use_gui){
6218
8cfddba867b4 fix text render chrash ...
pontscho
parents: 6217
diff changeset
1224 guiInit();
4963
13262bd21965 small changes
pontscho
parents: 4950
diff changeset
1225 inited_flags|=INITED_GUI;
4974
5da7b1522a9f small bug fixed and workarounds :(
pontscho
parents: 4965
diff changeset
1226 guiGetEvent( guiCEvent,(char *)((gui_no_filename) ? 0 : 1) );
4963
13262bd21965 small changes
pontscho
parents: 4950
diff changeset
1227 }
13262bd21965 small changes
pontscho
parents: 4950
diff changeset
1228 #endif
13262bd21965 small changes
pontscho
parents: 4950
diff changeset
1229
5983
4d868c3c9fff some cleanup around uninit()
arpi
parents: 5955
diff changeset
1230 // ******************* Now, let's see the per-file stuff ********************
4d868c3c9fff some cleanup around uninit()
arpi
parents: 5955
diff changeset
1231
1639
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
1232 play_next_file:
1787
de6a0987a08d stop fixed, fileselector supp. maybe not work, couldn't test
arpi
parents: 1772
diff changeset
1233
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
1234 // 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
1235 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
1236 { 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
1237 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
1238
8614
49e36bf2f342 The patch adds support for a per-file config, which is loaded before
arpi
parents: 8612
diff changeset
1239 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
1240
4835
1f59d4d73558 Fix my mistake (forgot to remove a getch2_enable) but in the rigth
albeu
parents: 4834
diff changeset
1241 // 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
1242 // or cache filling
12816
fba780800efe -use-stdin renamed to -noconsolecontrols.
diego
parents: 12753
diff changeset
1243 if(!noconsolecontrols && !slave_mode){
5983
4d868c3c9fff some cleanup around uninit()
arpi
parents: 5955
diff changeset
1244 if(inited_flags&INITED_GETCH2)
13577
606d90e03a2f printf --> mp_msg conversion
diego
parents: 13502
diff changeset
1245 mp_msg(MSGT_CPLAYER,MSGL_WARN,MSGTR_Getch2InitializedTwice);
5983
4d868c3c9fff some cleanup around uninit()
arpi
parents: 5955
diff changeset
1246 else
4d868c3c9fff some cleanup around uninit()
arpi
parents: 5955
diff changeset
1247 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
1248 inited_flags|=INITED_GETCH2;
5154
f67115a72b7c init/uninit libvo/ao/getch2/cache2 order fixed
arpi
parents: 5151
diff changeset
1249 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
1250 }
4825
41d2da3bd082 Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents: 4818
diff changeset
1251
5983
4d868c3c9fff some cleanup around uninit()
arpi
parents: 5955
diff changeset
1252 // =================== GUI idle loop (STOP state) ===========================
1745
64247d7d0076 add filename drawing
pontscho
parents: 1738
diff changeset
1253 #ifdef HAVE_NEW_GUI
1787
de6a0987a08d stop fixed, fileselector supp. maybe not work, couldn't test
arpi
parents: 1772
diff changeset
1254 if ( use_gui ) {
8423
c6a1a5b6ba25 - fix three submenu bug
pontscho
parents: 8366
diff changeset
1255 file_format=DEMUXER_TYPE_UNKNOWN;
c6a1a5b6ba25 - fix three submenu bug
pontscho
parents: 8366
diff changeset
1256 guiGetEvent( guiSetDefaults,0 );
5665
3e7f39c4110c fix dvd playing under gui
pontscho
parents: 5655
diff changeset
1257 while ( guiIntfStruct.Playing != 1 )
3e7f39c4110c fix dvd playing under gui
pontscho
parents: 5655
diff changeset
1258 {
4858
65730cea02e7 add half new input support for gui
pontscho
parents: 4856
diff changeset
1259 mp_cmd_t* cmd;
9464
a4e50ab9ac14 3x10l found by Dan Christiansen <danchr@daimi.au.dk>
alex
parents: 9380
diff changeset
1260 usec_sleep(20000);
4798
c39affa2b376 new interface ? :)
pontscho
parents: 4788
diff changeset
1261 guiEventHandling();
6619
f554e7271587 fix volume handling ( step 2 ) -- add balance support and some code cleanup and fix
pontscho
parents: 6590
diff changeset
1262 guiGetEvent( guiReDraw,NULL );
13603
80fc8f48f14c Do not loose commands while paused.
reimar
parents: 13577
diff changeset
1263 if ( (cmd = mp_input_get_cmd(0,0,0)) != NULL) guiGetEvent( guiIEvent,(char *)cmd->id );
5665
3e7f39c4110c fix dvd playing under gui
pontscho
parents: 5655
diff changeset
1264 }
8423
c6a1a5b6ba25 - fix three submenu bug
pontscho
parents: 8366
diff changeset
1265 guiGetEvent( guiSetParameters,NULL );
c6a1a5b6ba25 - fix three submenu bug
pontscho
parents: 8366
diff changeset
1266 if ( guiIntfStruct.StreamType == STREAMTYPE_STREAM )
3543
5a11cbf8791f some small sub bug fix
pontscho
parents: 3540
diff changeset
1267 {
4950
307a94037c5c bazmeg a playtree - t
pontscho
parents: 4940
diff changeset
1268 play_tree_t * entry = play_tree_new();
307a94037c5c bazmeg a playtree - t
pontscho
parents: 4940
diff changeset
1269 play_tree_add_file( entry,guiIntfStruct.Filename );
4974
5da7b1522a9f small bug fixed and workarounds :(
pontscho
parents: 4965
diff changeset
1270 if ( playtree ) play_tree_free_list( playtree->child,1 );
5da7b1522a9f small bug fixed and workarounds :(
pontscho
parents: 4965
diff changeset
1271 else playtree=play_tree_new();
5da7b1522a9f small bug fixed and workarounds :(
pontscho
parents: 4965
diff changeset
1272 play_tree_set_child( playtree,entry );
5da7b1522a9f small bug fixed and workarounds :(
pontscho
parents: 4965
diff changeset
1273 if(playtree)
4950
307a94037c5c bazmeg a playtree - t
pontscho
parents: 4940
diff changeset
1274 {
4974
5da7b1522a9f small bug fixed and workarounds :(
pontscho
parents: 4965
diff changeset
1275 playtree_iter = play_tree_iter_new(playtree,mconfig);
4950
307a94037c5c bazmeg a playtree - t
pontscho
parents: 4940
diff changeset
1276 if(playtree_iter)
307a94037c5c bazmeg a playtree - t
pontscho
parents: 4940
diff changeset
1277 {
307a94037c5c bazmeg a playtree - t
pontscho
parents: 4940
diff changeset
1278 if(play_tree_iter_step(playtree_iter,0,0) != PLAY_TREE_ITER_ENTRY)
307a94037c5c bazmeg a playtree - t
pontscho
parents: 4940
diff changeset
1279 {
307a94037c5c bazmeg a playtree - t
pontscho
parents: 4940
diff changeset
1280 play_tree_iter_free(playtree_iter);
307a94037c5c bazmeg a playtree - t
pontscho
parents: 4940
diff changeset
1281 playtree_iter = NULL;
307a94037c5c bazmeg a playtree - t
pontscho
parents: 4940
diff changeset
1282 }
307a94037c5c bazmeg a playtree - t
pontscho
parents: 4940
diff changeset
1283 filename = play_tree_iter_get_file(playtree_iter,1);
307a94037c5c bazmeg a playtree - t
pontscho
parents: 4940
diff changeset
1284 }
307a94037c5c bazmeg a playtree - t
pontscho
parents: 4940
diff changeset
1285 }
4974
5da7b1522a9f small bug fixed and workarounds :(
pontscho
parents: 4965
diff changeset
1286 }
1787
de6a0987a08d stop fixed, fileselector supp. maybe not work, couldn't test
arpi
parents: 1772
diff changeset
1287 }
de6a0987a08d stop fixed, fileselector supp. maybe not work, couldn't test
arpi
parents: 1772
diff changeset
1288 #endif
5983
4d868c3c9fff some cleanup around uninit()
arpi
parents: 5955
diff changeset
1289 //---------------------------------------------------------------------------
1787
de6a0987a08d stop fixed, fileselector supp. maybe not work, couldn't test
arpi
parents: 1772
diff changeset
1290
6138
523014df7d32 big cosmetics patch, cleanup of messages printed by mplayer and libs.
arpi
parents: 6135
diff changeset
1291 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
1292 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
1293
5983
4d868c3c9fff some cleanup around uninit()
arpi
parents: 5955
diff changeset
1294 //==================== Open VOB-Sub ============================
4d868c3c9fff some cleanup around uninit()
arpi
parents: 5955
diff changeset
1295
4770
59f8fd64538b autodetect vobsub filename, disable autosub if vobsub found.
atmos4
parents: 4754
diff changeset
1296 current_module="vobsub";
59f8fd64538b autodetect vobsub filename, disable autosub if vobsub found.
atmos4
parents: 4754
diff changeset
1297 if (vobsub_name){
6110
7bea806b9c5f Improvment for spu subtitles.
albeu
parents: 6082
diff changeset
1298 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
1299 if(vo_vobsub==NULL)
59f8fd64538b autodetect vobsub filename, disable autosub if vobsub found.
atmos4
parents: 4754
diff changeset
1300 mp_msg(MSGT_CPLAYER,MSGL_ERR,MSGTR_CantLoadSub,vobsub_name);
59f8fd64538b autodetect vobsub filename, disable autosub if vobsub found.
atmos4
parents: 4754
diff changeset
1301 }else if(sub_auto && filename && (strlen(filename)>=5)){
59f8fd64538b autodetect vobsub filename, disable autosub if vobsub found.
atmos4
parents: 4754
diff changeset
1302 /* try to autodetect vobsub from movie filename ::atmos */
59f8fd64538b autodetect vobsub filename, disable autosub if vobsub found.
atmos4
parents: 4754
diff changeset
1303 char *buf = malloc((strlen(filename)-3) * sizeof(char));
59f8fd64538b autodetect vobsub filename, disable autosub if vobsub found.
atmos4
parents: 4754
diff changeset
1304 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
1305 strncpy(buf, filename, strlen(filename)-4);
6110
7bea806b9c5f Improvment for spu subtitles.
albeu
parents: 6082
diff changeset
1306 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
1307 free(buf);
59f8fd64538b autodetect vobsub filename, disable autosub if vobsub found.
atmos4
parents: 4754
diff changeset
1308 }
7621
7caeb275ad26 uninit cleanup again... thx to Nilmoni Deb for bugreport
arpi
parents: 7614
diff changeset
1309 if(vo_vobsub){
7caeb275ad26 uninit cleanup again... thx to Nilmoni Deb for bugreport
arpi
parents: 7614
diff changeset
1310 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
1311 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
1312 // 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
1313 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
1314
a5004eb92a79 fix sub_select fiasco with global sub numbering. now multiple sub sources can be managed in essentially one list.
joey
parents: 13500
diff changeset
1315 // 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
1316 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
1317 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
1318 }
4770
59f8fd64538b autodetect vobsub filename, disable autosub if vobsub found.
atmos4
parents: 4754
diff changeset
1319
5151
610d399f50c3 - cleanup pass 1. more to come soon...
arpi
parents: 5138
diff changeset
1320 //============ Open & Sync STREAM --- fork cache2 ====================
610d399f50c3 - cleanup pass 1. more to come soon...
arpi
parents: 5138
diff changeset
1321
5983
4d868c3c9fff some cleanup around uninit()
arpi
parents: 5955
diff changeset
1322 stream=NULL;
4d868c3c9fff some cleanup around uninit()
arpi
parents: 5955
diff changeset
1323 demuxer=NULL;
10959
905acfd20c59 fix a memory leak when playing several files in a row (playlist for instance)
pl
parents: 10953
diff changeset
1324 if (d_audio) {
10997
2f7c74ce8c9a 1000l to pl, this made mplayer crash when playing playlists longer
rfelker
parents: 10959
diff changeset
1325 //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
1326 d_audio=NULL;
905acfd20c59 fix a memory leak when playing several files in a row (playlist for instance)
pl
parents: 10953
diff changeset
1327 }
905acfd20c59 fix a memory leak when playing several files in a row (playlist for instance)
pl
parents: 10953
diff changeset
1328 if (d_video) {
10997
2f7c74ce8c9a 1000l to pl, this made mplayer crash when playing playlists longer
rfelker
parents: 10959
diff changeset
1329 //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
1330 d_video=NULL;
905acfd20c59 fix a memory leak when playing several files in a row (playlist for instance)
pl
parents: 10953
diff changeset
1331 }
5983
4d868c3c9fff some cleanup around uninit()
arpi
parents: 5955
diff changeset
1332 sh_audio=NULL;
4d868c3c9fff some cleanup around uninit()
arpi
parents: 5955
diff changeset
1333 sh_video=NULL;
4d868c3c9fff some cleanup around uninit()
arpi
parents: 5955
diff changeset
1334
1639
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
1335 current_module="open_stream";
9752
3db72324a0fe Stream cleanup, don't use blah_on options anymore.
albeu
parents: 9695
diff changeset
1336 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
1337 if(!stream) { // error...
4825
41d2da3bd082 Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents: 4818
diff changeset
1338 eof = libmpdemux_was_interrupted(PT_NEXT_ENTRY);
41d2da3bd082 Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents: 4818
diff changeset
1339 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
1340 }
2321
5413f4fc560f uninit stream
arpi
parents: 2314
diff changeset
1341 inited_flags|=INITED_STREAM;
5151
610d399f50c3 - cleanup pass 1. more to come soon...
arpi
parents: 5138
diff changeset
1342
8423
c6a1a5b6ba25 - fix three submenu bug
pontscho
parents: 8366
diff changeset
1343 #ifdef HAVE_NEW_GUI
c6a1a5b6ba25 - fix three submenu bug
pontscho
parents: 8366
diff changeset
1344 if ( use_gui ) guiGetEvent( guiSetStream,(char *)stream );
c6a1a5b6ba25 - fix three submenu bug
pontscho
parents: 8366
diff changeset
1345 #endif
c6a1a5b6ba25 - fix three submenu bug
pontscho
parents: 8366
diff changeset
1346
9752
3db72324a0fe Stream cleanup, don't use blah_on options anymore.
albeu
parents: 9695
diff changeset
1347 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
1348 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
1349 // Handle playlist
5151
610d399f50c3 - cleanup pass 1. more to come soon...
arpi
parents: 5138
diff changeset
1350 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
1351 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
1352 entry = parse_playtree(stream,0);
5c15777f1c07 this patch adds an fallback to playlist (any but the plaintext-list format)
arpi
parents: 8913
diff changeset
1353 eof=playtree_add_playlist(entry);
4825
41d2da3bd082 Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents: 4818
diff changeset
1354 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
1355 }
1497
ad4d402b3d29 seek.c moved to demuxer.c, stream_reset in new_demuxer()
arpi
parents: 1496
diff changeset
1356 stream->start_pos+=seek_to_byte;
598
c7117e17e20b OSD seekbar fixed for mpeg/VCD
arpi_esp
parents: 595
diff changeset
1357
3257
b59502557e39 -dumpstream
arpi
parents: 3234
diff changeset
1358 if(stream_dump_type==5){
b59502557e39 -dumpstream
arpi
parents: 3234
diff changeset
1359 unsigned char buf[4096];
b59502557e39 -dumpstream
arpi
parents: 3234
diff changeset
1360 int len;
b59502557e39 -dumpstream
arpi
parents: 3234
diff changeset
1361 FILE *f;
5151
610d399f50c3 - cleanup pass 1. more to come soon...
arpi
parents: 5138
diff changeset
1362 current_module="dumpstream";
7204
eee464fa02c1 fix cache disable for live.com
atmos4
parents: 7202
diff changeset
1363 if(stream->type==STREAMTYPE_STREAM && stream->fd<0){
13577
606d90e03a2f printf --> mp_msg conversion
diego
parents: 13502
diff changeset
1364 mp_msg(MSGT_CPLAYER,MSGL_FATAL,MSGTR_DumpstreamFdUnavailable);
7204
eee464fa02c1 fix cache disable for live.com
atmos4
parents: 7202
diff changeset
1365 exit_player(MSGTR_Exit_error);
eee464fa02c1 fix cache disable for live.com
atmos4
parents: 7202
diff changeset
1366 }
3257
b59502557e39 -dumpstream
arpi
parents: 3234
diff changeset
1367 stream_reset(stream);
b59502557e39 -dumpstream
arpi
parents: 3234
diff changeset
1368 stream_seek(stream,stream->start_pos);
b59502557e39 -dumpstream
arpi
parents: 3234
diff changeset
1369 f=fopen(stream_dump_name,"wb");
b59502557e39 -dumpstream
arpi
parents: 3234
diff changeset
1370 if(!f){
b59502557e39 -dumpstream
arpi
parents: 3234
diff changeset
1371 mp_msg(MSGT_CPLAYER,MSGL_FATAL,MSGTR_CantOpenDumpfile);
b59502557e39 -dumpstream
arpi
parents: 3234
diff changeset
1372 exit_player(MSGTR_Exit_error);
b59502557e39 -dumpstream
arpi
parents: 3234
diff changeset
1373 }
b59502557e39 -dumpstream
arpi
parents: 3234
diff changeset
1374 while(!stream->eof){
b59502557e39 -dumpstream
arpi
parents: 3234
diff changeset
1375 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
1376 if(len>0) {
785c945f6796 check for -dumpstream file writes, patch by Eric Lammerts <eric@lammerts.org>
alex
parents: 10223
diff changeset
1377 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
1378 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
1379 exit_player(MSGTR_Exit_error);
785c945f6796 check for -dumpstream file writes, patch by Eric Lammerts <eric@lammerts.org>
alex
parents: 10223
diff changeset
1380 }
785c945f6796 check for -dumpstream file writes, patch by Eric Lammerts <eric@lammerts.org>
alex
parents: 10223
diff changeset
1381 }
3257
b59502557e39 -dumpstream
arpi
parents: 3234
diff changeset
1382 }
10225
785c945f6796 check for -dumpstream file writes, patch by Eric Lammerts <eric@lammerts.org>
alex
parents: 10223
diff changeset
1383 if(fclose(f)) {
785c945f6796 check for -dumpstream file writes, patch by Eric Lammerts <eric@lammerts.org>
alex
parents: 10223
diff changeset
1384 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
1385 exit_player(MSGTR_Exit_error);
785c945f6796 check for -dumpstream file writes, patch by Eric Lammerts <eric@lammerts.org>
alex
parents: 10223
diff changeset
1386 }
3257
b59502557e39 -dumpstream
arpi
parents: 3234
diff changeset
1387 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
1388 exit_player_with_rc(MSGTR_Exit_eof, 0);
3257
b59502557e39 -dumpstream
arpi
parents: 3234
diff changeset
1389 }
b59502557e39 -dumpstream
arpi
parents: 3234
diff changeset
1390
4274
f5759bbdd7be -alang/-slang fixed
arpi
parents: 4260
diff changeset
1391 #ifdef USE_DVDREAD
5425
f3a451b6f794 -alang sig11 when playing avis fixed - 10l
arpi
parents: 5411
diff changeset
1392 if(stream->type==STREAMTYPE_DVD){
f3a451b6f794 -alang sig11 when playing avis fixed - 10l
arpi
parents: 5411
diff changeset
1393 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
1394 if(audio_id==-1) audio_id=dvd_aid_from_lang(stream,audio_lang);
5425
f3a451b6f794 -alang sig11 when playing avis fixed - 10l
arpi
parents: 5411
diff changeset
1395 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
1396 // 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
1397 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
1398 global_sub_size += dvd_number_of_subs(stream);
5425
f3a451b6f794 -alang sig11 when playing avis fixed - 10l
arpi
parents: 5411
diff changeset
1399 current_module=NULL;
f3a451b6f794 -alang sig11 when playing avis fixed - 10l
arpi
parents: 5411
diff changeset
1400 }
4274
f5759bbdd7be -alang/-slang fixed
arpi
parents: 4260
diff changeset
1401 #endif
f5759bbdd7be -alang/-slang fixed
arpi
parents: 4260
diff changeset
1402
5489
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
1403 #ifdef USE_DVDNAV
9752
3db72324a0fe Stream cleanup, don't use blah_on options anymore.
albeu
parents: 9695
diff changeset
1404 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
1405 #endif
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
1406
5151
610d399f50c3 - cleanup pass 1. more to come soon...
arpi
parents: 5138
diff changeset
1407 // 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
1408 #ifdef HAS_DVBIN_SUPPORT
11352
d8b1f7509df2 Patch by Nico <nsabbi@libero.it>
attila
parents: 11331
diff changeset
1409 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
1410 #endif
7881
aba9301ed3c4 allow cache to be disabled (-nocache should override cachesize autodetection
arpi
parents: 7867
diff changeset
1411 if(stream_cache_size>0){
5151
610d399f50c3 - cleanup pass 1. more to come soon...
arpi
parents: 5138
diff changeset
1412 current_module="enable_cache";
12835
4235ae5a2d60 cache min fill adjustment, based on patch by Jeremy Huddleston
iive
parents: 12816
diff changeset
1413 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
610d399f50c3 - cleanup pass 1. more to come soon...
arpi
parents: 5138
diff changeset
1414 if((eof = libmpdemux_was_interrupted(PT_NEXT_ENTRY))) goto goto_next_file;
610d399f50c3 - cleanup pass 1. more to come soon...
arpi
parents: 5138
diff changeset
1415 }
1639
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
1416
5151
610d399f50c3 - cleanup pass 1. more to come soon...
arpi
parents: 5138
diff changeset
1417 //============ Open DEMUXERS --- DETECT file type =======================
1639
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
1418 current_module="demux_open";
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
1419
9006
d00997f12257 extension-based filetype detection for headerless files (mp3 vs mpeg, etc)
arpi
parents: 9003
diff changeset
1420 demuxer=demux_open(stream,file_format,audio_id,video_id,dvdsub_id,filename);
8937
afca652cb0e5 patch adds support for MOV-Reference-Files.
arpi
parents: 8932
diff changeset
1421
afca652cb0e5 patch adds support for MOV-Reference-Files.
arpi
parents: 8932
diff changeset
1422 // HACK to get MOV Reference Files working
afca652cb0e5 patch adds support for MOV-Reference-Files.
arpi
parents: 8932
diff changeset
1423
afca652cb0e5 patch adds support for MOV-Reference-Files.
arpi
parents: 8932
diff changeset
1424 if (demuxer && demuxer->type==DEMUXER_TYPE_PLAYLIST)
afca652cb0e5 patch adds support for MOV-Reference-Files.
arpi
parents: 8932
diff changeset
1425 {
afca652cb0e5 patch adds support for MOV-Reference-Files.
arpi
parents: 8932
diff changeset
1426 unsigned char* playlist_entry;
afca652cb0e5 patch adds support for MOV-Reference-Files.
arpi
parents: 8932
diff changeset
1427 play_tree_t *list = NULL, *entry = NULL;
afca652cb0e5 patch adds support for MOV-Reference-Files.
arpi
parents: 8932
diff changeset
1428
afca652cb0e5 patch adds support for MOV-Reference-Files.
arpi
parents: 8932
diff changeset
1429 current_module="handle_demux_playlist";
afca652cb0e5 patch adds support for MOV-Reference-Files.
arpi
parents: 8932
diff changeset
1430 while (ds_get_packet(demuxer->video,&playlist_entry)>0)
afca652cb0e5 patch adds support for MOV-Reference-Files.
arpi
parents: 8932
diff changeset
1431 {
afca652cb0e5 patch adds support for MOV-Reference-Files.
arpi
parents: 8932
diff changeset
1432 char *temp, *bname;
afca652cb0e5 patch adds support for MOV-Reference-Files.
arpi
parents: 8932
diff changeset
1433
13577
606d90e03a2f printf --> mp_msg conversion
diego
parents: 13502
diff changeset
1434 mp_msg(MSGT_CPLAYER,MSGL_V,"Adding file %s to element entry.\n",playlist_entry);
8937
afca652cb0e5 patch adds support for MOV-Reference-Files.
arpi
parents: 8932
diff changeset
1435
afca652cb0e5 patch adds support for MOV-Reference-Files.
arpi
parents: 8932
diff changeset
1436 bname=mp_basename(playlist_entry);
afca652cb0e5 patch adds support for MOV-Reference-Files.
arpi
parents: 8932
diff changeset
1437 if ((strlen(bname)>10) && !strncmp(bname,"qt",2) && !strncmp(bname+3,"gateQT",6))
afca652cb0e5 patch adds support for MOV-Reference-Files.
arpi
parents: 8932
diff changeset
1438 continue;
afca652cb0e5 patch adds support for MOV-Reference-Files.
arpi
parents: 8932
diff changeset
1439
9124
ff773800b598 I also added that a self-reference is not endlessly played ... (Happened
arpi
parents: 9105
diff changeset
1440 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
1441 continue;
ff773800b598 I also added that a self-reference is not endlessly played ... (Happened
arpi
parents: 9105
diff changeset
1442
8937
afca652cb0e5 patch adds support for MOV-Reference-Files.
arpi
parents: 8932
diff changeset
1443 entry = play_tree_new();
afca652cb0e5 patch adds support for MOV-Reference-Files.
arpi
parents: 8932
diff changeset
1444
afca652cb0e5 patch adds support for MOV-Reference-Files.
arpi
parents: 8932
diff changeset
1445 if (filename && !strcmp(mp_basename(playlist_entry),playlist_entry)) // add reference path of current file
afca652cb0e5 patch adds support for MOV-Reference-Files.
arpi
parents: 8932
diff changeset
1446 {
afca652cb0e5 patch adds support for MOV-Reference-Files.
arpi
parents: 8932
diff changeset
1447 temp=malloc((strlen(filename)-strlen(mp_basename(filename))+strlen(playlist_entry)+1)*sizeof(char));
afca652cb0e5 patch adds support for MOV-Reference-Files.
arpi
parents: 8932
diff changeset
1448 if (temp)
afca652cb0e5 patch adds support for MOV-Reference-Files.
arpi
parents: 8932
diff changeset
1449 {
afca652cb0e5 patch adds support for MOV-Reference-Files.
arpi
parents: 8932
diff changeset
1450 strncpy(temp, filename, strlen(filename)-strlen(mp_basename(filename)));
afca652cb0e5 patch adds support for MOV-Reference-Files.
arpi
parents: 8932
diff changeset
1451 temp[strlen(filename)-strlen(mp_basename(filename))]='\0';
afca652cb0e5 patch adds support for MOV-Reference-Files.
arpi
parents: 8932
diff changeset
1452 strcat(temp, playlist_entry);
afca652cb0e5 patch adds support for MOV-Reference-Files.
arpi
parents: 8932
diff changeset
1453 play_tree_add_file(entry,temp);
13577
606d90e03a2f printf --> mp_msg conversion
diego
parents: 13502
diff changeset
1454 mp_msg(MSGT_CPLAYER,MSGL_V,"Resolving reference to %s.\n",temp);
8937
afca652cb0e5 patch adds support for MOV-Reference-Files.
arpi
parents: 8932
diff changeset
1455 free(temp);
afca652cb0e5 patch adds support for MOV-Reference-Files.
arpi
parents: 8932
diff changeset
1456 }
afca652cb0e5 patch adds support for MOV-Reference-Files.
arpi
parents: 8932
diff changeset
1457 }
afca652cb0e5 patch adds support for MOV-Reference-Files.
arpi
parents: 8932
diff changeset
1458 else
afca652cb0e5 patch adds support for MOV-Reference-Files.
arpi
parents: 8932
diff changeset
1459 play_tree_add_file(entry,playlist_entry);
afca652cb0e5 patch adds support for MOV-Reference-Files.
arpi
parents: 8932
diff changeset
1460
afca652cb0e5 patch adds support for MOV-Reference-Files.
arpi
parents: 8932
diff changeset
1461 if(!list)
afca652cb0e5 patch adds support for MOV-Reference-Files.
arpi
parents: 8932
diff changeset
1462 list = entry;
afca652cb0e5 patch adds support for MOV-Reference-Files.
arpi
parents: 8932
diff changeset
1463 else
afca652cb0e5 patch adds support for MOV-Reference-Files.
arpi
parents: 8932
diff changeset
1464 play_tree_append_entry(list,entry);
afca652cb0e5 patch adds support for MOV-Reference-Files.
arpi
parents: 8932
diff changeset
1465 }
afca652cb0e5 patch adds support for MOV-Reference-Files.
arpi
parents: 8932
diff changeset
1466 free_demuxer(demuxer);
afca652cb0e5 patch adds support for MOV-Reference-Files.
arpi
parents: 8932
diff changeset
1467 demuxer = NULL;
afca652cb0e5 patch adds support for MOV-Reference-Files.
arpi
parents: 8932
diff changeset
1468
afca652cb0e5 patch adds support for MOV-Reference-Files.
arpi
parents: 8932
diff changeset
1469 if (list)
afca652cb0e5 patch adds support for MOV-Reference-Files.
arpi
parents: 8932
diff changeset
1470 {
afca652cb0e5 patch adds support for MOV-Reference-Files.
arpi
parents: 8932
diff changeset
1471 entry = play_tree_new();
afca652cb0e5 patch adds support for MOV-Reference-Files.
arpi
parents: 8932
diff changeset
1472 play_tree_set_child(entry,list);
afca652cb0e5 patch adds support for MOV-Reference-Files.
arpi
parents: 8932
diff changeset
1473 eof=playtree_add_playlist(entry);
afca652cb0e5 patch adds support for MOV-Reference-Files.
arpi
parents: 8932
diff changeset
1474 goto goto_next_file;
afca652cb0e5 patch adds support for MOV-Reference-Files.
arpi
parents: 8932
diff changeset
1475 }
afca652cb0e5 patch adds support for MOV-Reference-Files.
arpi
parents: 8932
diff changeset
1476 }
afca652cb0e5 patch adds support for MOV-Reference-Files.
arpi
parents: 8932
diff changeset
1477
8925
5c15777f1c07 this patch adds an fallback to playlist (any but the plaintext-list format)
arpi
parents: 8913
diff changeset
1478 if(!demuxer)
5c15777f1c07 this patch adds an fallback to playlist (any but the plaintext-list format)
arpi
parents: 8913
diff changeset
1479 {
10953
70a974306f9b disable code that DOES NOT WORK (it won't load real playlists and
rfelker
parents: 10928
diff changeset
1480 #if 0
8925
5c15777f1c07 this patch adds an fallback to playlist (any but the plaintext-list format)
arpi
parents: 8913
diff changeset
1481 play_tree_t* entry;
5c15777f1c07 this patch adds an fallback to playlist (any but the plaintext-list format)
arpi
parents: 8913
diff changeset
1482 // Handle playlist
5c15777f1c07 this patch adds an fallback to playlist (any but the plaintext-list format)
arpi
parents: 8913
diff changeset
1483 current_module="handle_playlist";
9090
arpi
parents: 9088
diff changeset
1484 switch(stream->type){
arpi
parents: 9088
diff changeset
1485 case STREAMTYPE_VCD:
arpi
parents: 9088
diff changeset
1486 case STREAMTYPE_DVD:
arpi
parents: 9088
diff changeset
1487 case STREAMTYPE_DVDNAV:
arpi
parents: 9088
diff changeset
1488 case STREAMTYPE_CDDA:
arpi
parents: 9088
diff changeset
1489 case STREAMTYPE_VCDBINCUE:
arpi
parents: 9088
diff changeset
1490 // don't try to parse raw media as playlist, it's unlikely
arpi
parents: 9088
diff changeset
1491 goto goto_next_file;
arpi
parents: 9088
diff changeset
1492 }
13577
606d90e03a2f printf --> mp_msg conversion
diego
parents: 13502
diff changeset
1493 mp_msg(MSGT_CPLAYER,MSGL_INFO,MSGTR_FallingBackOnPlaylist,filename);
8925
5c15777f1c07 this patch adds an fallback to playlist (any but the plaintext-list format)
arpi
parents: 8913
diff changeset
1494 stream_reset(stream);
5c15777f1c07 this patch adds an fallback to playlist (any but the plaintext-list format)
arpi
parents: 8913
diff changeset
1495 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
1496 entry = parse_playtree(stream,0);
5c15777f1c07 this patch adds an fallback to playlist (any but the plaintext-list format)
arpi
parents: 8913
diff changeset
1497 if(!entry)
5c15777f1c07 this patch adds an fallback to playlist (any but the plaintext-list format)
arpi
parents: 8913
diff changeset
1498 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
1499 else
5c15777f1c07 this patch adds an fallback to playlist (any but the plaintext-list format)
arpi
parents: 8913
diff changeset
1500 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
1501 #endif
8925
5c15777f1c07 this patch adds an fallback to playlist (any but the plaintext-list format)
arpi
parents: 8913
diff changeset
1502 goto goto_next_file;
5c15777f1c07 this patch adds an fallback to playlist (any but the plaintext-list format)
arpi
parents: 8913
diff changeset
1503 }
7058
2e5c07262861 new v4l capture patch by Jindrich Makovicka <makovick@kmlinux.fjfi.cvut.cz>:
arpi
parents: 7055
diff changeset
1504 inited_flags|=INITED_DEMUXER;
2e5c07262861 new v4l capture patch by Jindrich Makovicka <makovick@kmlinux.fjfi.cvut.cz>:
arpi
parents: 7055
diff changeset
1505
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
1506 #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
1507 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
1508 // 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
1509 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
1510 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
1511 }
a5004eb92a79 fix sub_select fiasco with global sub numbering. now multiple sub sources can be managed in essentially one list.
joey
parents: 13500
diff changeset
1512 #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
1513 #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
1514 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
1515 // setup global sub numbering
a5004eb92a79 fix sub_select fiasco with global sub numbering. now multiple sub sources can be managed in essentially one list.
joey
parents: 13500
diff changeset
1516 global_sub_indices[SUB_SOURCE_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
1517 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
1518 }
a5004eb92a79 fix sub_select fiasco with global sub numbering. now multiple sub sources can be managed in essentially one list.
joey
parents: 13500
diff changeset
1519 #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
1520
5175
8354d89498d4 video codec selection redesigned and moved to libmpcodecs - now it's 'intelligent'
arpi
parents: 5154
diff changeset
1521 current_module="demux_open2";
8354d89498d4 video codec selection redesigned and moved to libmpcodecs - now it's 'intelligent'
arpi
parents: 5154
diff changeset
1522
1660
0ed5a9568d0f file_format -> demuxer->file_format
arpi
parents: 1654
diff changeset
1523 //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
1524
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1525 d_audio=demuxer->audio;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1526 d_video=demuxer->video;
554
d8b3c80604e3 dvd sub parser move dto mplayer.c
arpi_esp
parents: 552
diff changeset
1527 d_dvdsub=demuxer->sub;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1528
792
62d7f36e6127 dump stuff moved before header parsing
arpi_esp
parents: 782
diff changeset
1529 // DUMP STREAMS:
6209
e46b3bf16df5 added -dumpsrtsub option for SubRip format
iive
parents: 6204
diff changeset
1530 if((stream_dump_type)&&(stream_dump_type<4)){
792
62d7f36e6127 dump stuff moved before header parsing
arpi_esp
parents: 782
diff changeset
1531 FILE *f;
62d7f36e6127 dump stuff moved before header parsing
arpi_esp
parents: 782
diff changeset
1532 demux_stream_t *ds=NULL;
1639
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
1533 current_module="dump";
792
62d7f36e6127 dump stuff moved before header parsing
arpi_esp
parents: 782
diff changeset
1534 // select stream to dump
62d7f36e6127 dump stuff moved before header parsing
arpi_esp
parents: 782
diff changeset
1535 switch(stream_dump_type){
62d7f36e6127 dump stuff moved before header parsing
arpi_esp
parents: 782
diff changeset
1536 case 1: ds=d_audio;break;
62d7f36e6127 dump stuff moved before header parsing
arpi_esp
parents: 782
diff changeset
1537 case 2: ds=d_video;break;
4335
270cbfe45b30 mpsub dump bug fix. 100l for laaz
pontscho
parents: 4274
diff changeset
1538 case 3: ds=d_dvdsub;break;
792
62d7f36e6127 dump stuff moved before header parsing
arpi_esp
parents: 782
diff changeset
1539 }
62d7f36e6127 dump stuff moved before header parsing
arpi_esp
parents: 782
diff changeset
1540 if(!ds){
7805
f71bc57c4da9 Fixed two typos noticed by Sycotic Smith (I think).
diego
parents: 7790
diff changeset
1541 mp_msg(MSGT_CPLAYER,MSGL_FATAL,MSGTR_DumpSelectedStreamMissing);
1639
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
1542 exit_player(MSGTR_Exit_error);
792
62d7f36e6127 dump stuff moved before header parsing
arpi_esp
parents: 782
diff changeset
1543 }
62d7f36e6127 dump stuff moved before header parsing
arpi_esp
parents: 782
diff changeset
1544 // disable other streams:
62d7f36e6127 dump stuff moved before header parsing
arpi_esp
parents: 782
diff changeset
1545 if(d_audio && d_audio!=ds) {ds_free_packs(d_audio); d_audio->id=-2; }
62d7f36e6127 dump stuff moved before header parsing
arpi_esp
parents: 782
diff changeset
1546 if(d_video && d_video!=ds) {ds_free_packs(d_video); d_video->id=-2; }
62d7f36e6127 dump stuff moved before header parsing
arpi_esp
parents: 782
diff changeset
1547 if(d_dvdsub && d_dvdsub!=ds) {ds_free_packs(d_dvdsub); d_dvdsub->id=-2; }
62d7f36e6127 dump stuff moved before header parsing
arpi_esp
parents: 782
diff changeset
1548 // let's dump it!
3257
b59502557e39 -dumpstream
arpi
parents: 3234
diff changeset
1549 f=fopen(stream_dump_name,"wb");
1639
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
1550 if(!f){
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
1551 mp_msg(MSGT_CPLAYER,MSGL_FATAL,MSGTR_CantOpenDumpfile);
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
1552 exit_player(MSGTR_Exit_error);
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
1553 }
792
62d7f36e6127 dump stuff moved before header parsing
arpi_esp
parents: 782
diff changeset
1554 while(!ds->eof){
62d7f36e6127 dump stuff moved before header parsing
arpi_esp
parents: 782
diff changeset
1555 unsigned char* start;
62d7f36e6127 dump stuff moved before header parsing
arpi_esp
parents: 782
diff changeset
1556 int in_size=ds_get_packet(ds,&start);
2102
569a5d7b5d8a mov timing fixes (same way as asf)
arpi
parents: 2042
diff changeset
1557 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
1558 && stream_dump_type==2) fwrite(&in_size,1,4,f);
792
62d7f36e6127 dump stuff moved before header parsing
arpi_esp
parents: 782
diff changeset
1559 if(in_size>0) fwrite(start,in_size,1,f);
62d7f36e6127 dump stuff moved before header parsing
arpi_esp
parents: 782
diff changeset
1560 }
62d7f36e6127 dump stuff moved before header parsing
arpi_esp
parents: 782
diff changeset
1561 fclose(f);
1582
12aa68bf2ff5 erros emssages moved to help_mp.h for translation
arpi
parents: 1567
diff changeset
1562 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
1563 exit_player_with_rc(MSGTR_Exit_eof, 0);
792
62d7f36e6127 dump stuff moved before header parsing
arpi_esp
parents: 782
diff changeset
1564 }
62d7f36e6127 dump stuff moved before header parsing
arpi_esp
parents: 782
diff changeset
1565
1375
dbcb5b5e1fae file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents: 1369
diff changeset
1566 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
1567 sh_video=d_video->sh;
792
62d7f36e6127 dump stuff moved before header parsing
arpi_esp
parents: 782
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 if(sh_video){
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1570
5151
610d399f50c3 - cleanup pass 1. more to come soon...
arpi
parents: 5138
diff changeset
1571 current_module="video_read_properties";
4587
886bf5274992 Audio only support. Include a fix in the asf demuxer opening.
albeu
parents: 4552
diff changeset
1572 if(!video_read_properties(sh_video)) {
7805
f71bc57c4da9 Fixed two typos noticed by Sycotic Smith (I think).
diego
parents: 7790
diff changeset
1573 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
1574 sh_video=d_video->sh=NULL;
886bf5274992 Audio only support. Include a fix in the asf demuxer opening.
albeu
parents: 4552
diff changeset
1575 } else {
6138
523014df7d32 big cosmetics patch, cleanup of messages printed by mplayer and libs.
arpi
parents: 6135
diff changeset
1576 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
1577 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
1578 sh_video->fps,sh_video->frametime
886bf5274992 Audio only support. Include a fix in the asf demuxer opening.
albeu
parents: 4552
diff changeset
1579 );
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1580
4598
badb76094897 setting vo_fps, required for vo_yuv4mpeg
arpi
parents: 4593
diff changeset
1581 /* need to set fps here for output encoders to pick it up in their init */
badb76094897 setting vo_fps, required for vo_yuv4mpeg
arpi
parents: 4593
diff changeset
1582 if(force_fps){
badb76094897 setting vo_fps, required for vo_yuv4mpeg
arpi
parents: 4593
diff changeset
1583 sh_video->fps=force_fps;
badb76094897 setting vo_fps, required for vo_yuv4mpeg
arpi
parents: 4593
diff changeset
1584 sh_video->frametime=1.0f/sh_video->fps;
badb76094897 setting vo_fps, required for vo_yuv4mpeg
arpi
parents: 4593
diff changeset
1585 }
7562
92188b57a062 video out driver list support (like -vc, example: -vo xmga,xv,x11,)
arpi
parents: 7559
diff changeset
1586 vo_fps = sh_video->fps;
10661
49d7d02f4485 X11_FULLSCREEN vs HAVE_X11 definitions and some warning fixes
alex
parents: 10646
diff changeset
1587 #ifdef HAVE_X11
7562
92188b57a062 video out driver list support (like -vc, example: -vo xmga,xv,x11,)
arpi
parents: 7559
diff changeset
1588 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
1589 #endif
4598
badb76094897 setting vo_fps, required for vo_yuv4mpeg
arpi
parents: 4593
diff changeset
1590
4587
886bf5274992 Audio only support. Include a fix in the asf demuxer opening.
albeu
parents: 4552
diff changeset
1591 if(!sh_video->fps && !force_fps){
886bf5274992 Audio only support. Include a fix in the asf demuxer opening.
albeu
parents: 4552
diff changeset
1592 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
1593 sh_video=d_video->sh=NULL;
886bf5274992 Audio only support. Include a fix in the asf demuxer opening.
albeu
parents: 4552
diff changeset
1594 }
1375
dbcb5b5e1fae file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents: 1369
diff changeset
1595 }
dbcb5b5e1fae file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents: 1369
diff changeset
1596
dbcb5b5e1fae file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents: 1369
diff changeset
1597 }
398
f5918fc8df10 more cleanup of video decoding
arpi_esp
parents: 396
diff changeset
1598
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1599 fflush(stdout);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1600
4587
886bf5274992 Audio only support. Include a fix in the asf demuxer opening.
albeu
parents: 4552
diff changeset
1601 if(!sh_video && !sh_audio){
6930
cae1dd6343e7 moved messages to help_mp-??.h
jaf
parents: 6921
diff changeset
1602 mp_msg(MSGT_CPLAYER,MSGL_FATAL, MSGTR_NoStreamFound);
10708
a57e8d980652 This patch fixes:
alex
parents: 10707
diff changeset
1603 #ifdef HAS_DVBIN_SUPPORT
a57e8d980652 This patch fixes:
alex
parents: 10707
diff changeset
1604 if((stream->type == STREAMTYPE_DVB) && stream->priv)
a57e8d980652 This patch fixes:
alex
parents: 10707
diff changeset
1605 {
a57e8d980652 This patch fixes:
alex
parents: 10707
diff changeset
1606 dvb_priv_t *priv = (dvb_priv_t*) stream->priv;
a57e8d980652 This patch fixes:
alex
parents: 10707
diff changeset
1607 if(priv->is_on)
a57e8d980652 This patch fixes:
alex
parents: 10707
diff changeset
1608 {
a57e8d980652 This patch fixes:
alex
parents: 10707
diff changeset
1609 int dir;
a57e8d980652 This patch fixes:
alex
parents: 10707
diff changeset
1610 int v = last_dvb_step;
a57e8d980652 This patch fixes:
alex
parents: 10707
diff changeset
1611 if(v > 0)
a57e8d980652 This patch fixes:
alex
parents: 10707
diff changeset
1612 dir = DVB_CHANNEL_HIGHER;
a57e8d980652 This patch fixes:
alex
parents: 10707
diff changeset
1613 else
a57e8d980652 This patch fixes:
alex
parents: 10707
diff changeset
1614 dir = DVB_CHANNEL_LOWER;
a57e8d980652 This patch fixes:
alex
parents: 10707
diff changeset
1615
a57e8d980652 This patch fixes:
alex
parents: 10707
diff changeset
1616 if(dvb_step_channel(priv, dir))
a57e8d980652 This patch fixes:
alex
parents: 10707
diff changeset
1617 {
a57e8d980652 This patch fixes:
alex
parents: 10707
diff changeset
1618 uninit_player(INITED_ALL-(INITED_STREAM|INITED_INPUT));
11352
d8b1f7509df2 Patch by Nico <nsabbi@libero.it>
attila
parents: 11331
diff changeset
1619 cache_uninit(stream);
d8b1f7509df2 Patch by Nico <nsabbi@libero.it>
attila
parents: 11331
diff changeset
1620 goto goto_enable_cache;
10708
a57e8d980652 This patch fixes:
alex
parents: 10707
diff changeset
1621 }
a57e8d980652 This patch fixes:
alex
parents: 10707
diff changeset
1622 }
a57e8d980652 This patch fixes:
alex
parents: 10707
diff changeset
1623 }
a57e8d980652 This patch fixes:
alex
parents: 10707
diff changeset
1624 #endif
1641
b7dae998505c free stream/demuxer. continue playback with next file if error found
arpi
parents: 1639
diff changeset
1625 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
1626 }
13c0dfde813b removed dummy audio track for -nosound, vo: flip detection
arpi_esp
parents: 766
diff changeset
1627
5151
610d399f50c3 - cleanup pass 1. more to come soon...
arpi
parents: 5138
diff changeset
1628 /* display clip info */
610d399f50c3 - cleanup pass 1. more to come soon...
arpi
parents: 5138
diff changeset
1629 demux_info_print(demuxer);
610d399f50c3 - cleanup pass 1. more to come soon...
arpi
parents: 5138
diff changeset
1630
610d399f50c3 - cleanup pass 1. more to come soon...
arpi
parents: 5138
diff changeset
1631 //================== Read SUBTITLES (DVD & TEXT) ==========================
13126
b59e16a8dfc7 Support for subtitle switching in Matroska.
mosu
parents: 13122
diff changeset
1632 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
1633
5388
3af2729c5c87 * New command line switch for mplayer & mencoder:
kmkaplan
parents: 5380
diff changeset
1634 if (spudec_ifo) {
3af2729c5c87 * New command line switch for mplayer & mencoder:
kmkaplan
parents: 5380
diff changeset
1635 unsigned int palette[16], width, height;
5489
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
1636 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
1637 if (vobsub_parse_ifo(NULL,spudec_ifo, palette, &width, &height, 1, -1, NULL) >= 0)
7790
kmkaplan
parents: 7780
diff changeset
1638 vo_spudec=spudec_new_scaled(palette, width, height);
5388
3af2729c5c87 * New command line switch for mplayer & mencoder:
kmkaplan
parents: 5380
diff changeset
1639 }
3af2729c5c87 * New command line switch for mplayer & mencoder:
kmkaplan
parents: 5380
diff changeset
1640
5489
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
1641 #ifdef USE_DVDNAV
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
1642 if (vo_spudec==NULL && stream->type==STREAMTYPE_DVDNAV) {
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
1643 current_module="spudec_init_dvdnav";
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
1644 vo_spudec=spudec_new_scaled(dvdnav_stream_get_palette((dvdnav_priv_t*)(stream->priv)),
4087
07d831705ec6 Support software scaling with DVD subtitles
kmkaplan
parents: 4079
diff changeset
1645 sh_video->disp_w, sh_video->disp_h);
5411
6918c74caa4d 1 step closed to solving memory corruptions
arpi
parents: 5410
diff changeset
1646 }
6918c74caa4d 1 step closed to solving memory corruptions
arpi
parents: 5410
diff changeset
1647 #endif
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 #ifdef USE_DVDREAD
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
1650 if (vo_spudec==NULL && stream->type==STREAMTYPE_DVD) {
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
1651 current_module="spudec_init_dvdread";
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
1652 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
1653 sh_video->disp_w, sh_video->disp_h);
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
1654 }
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
1655 #endif
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
1656
11153
cb82b062188f Support for VobSub-in-Matroska; parts outside of demux_mkv.cpp.
mosu
parents: 10997
diff changeset
1657 #ifdef HAVE_MATROSKA
cb82b062188f Support for VobSub-in-Matroska; parts outside of demux_mkv.cpp.
mosu
parents: 10997
diff changeset
1658 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
1659 (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
1660 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
1661 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
1662 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
1663 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
1664 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
1665 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
1666 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
1667 }
cb82b062188f Support for VobSub-in-Matroska; parts outside of demux_mkv.cpp.
mosu
parents: 10997
diff changeset
1668 #endif
cb82b062188f Support for VobSub-in-Matroska; parts outside of demux_mkv.cpp.
mosu
parents: 10997
diff changeset
1669
5489
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
1670 if (vo_spudec==NULL) {
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
1671 current_module="spudec_init_normal";
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
1672 vo_spudec=spudec_new_scaled(NULL, sh_video->disp_w, sh_video->disp_h);
6110
7bea806b9c5f Improvment for spu subtitles.
albeu
parents: 6082
diff changeset
1673 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
1674 }
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
1675
4087
07d831705ec6 Support software scaling with DVD subtitles
kmkaplan
parents: 4079
diff changeset
1676 if (vo_spudec!=NULL)
07d831705ec6 Support software scaling with DVD subtitles
kmkaplan
parents: 4079
diff changeset
1677 inited_flags|=INITED_SPUDEC;
4274
f5759bbdd7be -alang/-slang fixed
arpi
parents: 4260
diff changeset
1678
6110
7bea806b9c5f Improvment for spu subtitles.
albeu
parents: 6082
diff changeset
1679 }
7bea806b9c5f Improvment for spu subtitles.
albeu
parents: 6082
diff changeset
1680
10917
d45870f67728 Forced subtitles patch by Arne Driescher <driescher@mpi-magdeburg.mpg.de>
attila
parents: 10884
diff changeset
1681 // Apply current settings for forced subs
d45870f67728 Forced subtitles patch by Arne Driescher <driescher@mpi-magdeburg.mpg.de>
attila
parents: 10884
diff changeset
1682 if (vo_spudec!=NULL)
d45870f67728 Forced subtitles patch by Arne Driescher <driescher@mpi-magdeburg.mpg.de>
attila
parents: 10884
diff changeset
1683 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
1684
4052
505f206d80d1 corrections to adjust_subs_time function which now uses fps if needed
atlka
parents: 4045
diff changeset
1685 #ifdef USE_SUB
6110
7bea806b9c5f Improvment for spu subtitles.
albeu
parents: 6082
diff changeset
1686 if(sh_video) {
4064
3c747168eb6e 1. subs know are readed after reading AVI header so we already know fps
atlka
parents: 4052
diff changeset
1687 // 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
1688 // 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
1689 // check .sub
5151
610d399f50c3 - cleanup pass 1. more to come soon...
arpi
parents: 5138
diff changeset
1690 current_module="read_subtitles_file";
610d399f50c3 - cleanup pass 1. more to come soon...
arpi
parents: 5138
diff changeset
1691 if(sub_name){
9870
09d630a4f991 support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents: 9831
diff changeset
1692 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
1693 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
1694 }
5151
610d399f50c3 - cleanup pass 1. more to come soon...
arpi
parents: 5138
diff changeset
1695 if(sub_auto) { // auto load sub file ...
11767
e6db1c939c25 prevent sig11 when $HOME is not set
attila
parents: 11759
diff changeset
1696 char *psub = get_path( "sub/" );
e6db1c939c25 prevent sig11 when $HOME is not set
attila
parents: 11759
diff changeset
1697 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
1698 char **tmp2 = tmp;
12890
9a45f43bf9a0 false-use-of-get_path() memleak fixes.
al
parents: 12841
diff changeset
1699 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
1700 while (*tmp2)
09d630a4f991 support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents: 9831
diff changeset
1701 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
1702 free(tmp);
09d630a4f991 support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents: 9831
diff changeset
1703 if (set_of_sub_size == 0)
12893
0c28de2f031f fix segfault when loading subtitles (idea by pl)
rathann
parents: 12890
diff changeset
1704 {
12890
9a45f43bf9a0 false-use-of-get_path() memleak fixes.
al
parents: 12841
diff changeset
1705 add_subtitles (mem_ptr=get_path("default.sub"), sh_video->fps, 1);
9a45f43bf9a0 false-use-of-get_path() memleak fixes.
al
parents: 12841
diff changeset
1706 free(mem_ptr); // release the buffer created by get_path()
12893
0c28de2f031f fix segfault when loading subtitles (idea by pl)
rathann
parents: 12890
diff changeset
1707 }
9870
09d630a4f991 support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents: 9831
diff changeset
1708 if (set_of_sub_size > 0)
09d630a4f991 support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents: 9831
diff changeset
1709 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
1710 }
9870
09d630a4f991 support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents: 9831
diff changeset
1711 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
1712 // 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
1713 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
1714 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
1715 }
5151
610d399f50c3 - cleanup pass 1. more to come soon...
arpi
parents: 5138
diff changeset
1716 }
6110
7bea806b9c5f Improvment for spu subtitles.
albeu
parents: 6082
diff changeset
1717 #endif
7bea806b9c5f Improvment for spu subtitles.
albeu
parents: 6082
diff changeset
1718
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
1719 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
1720 // 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
1721 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
1722 // 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
1723 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
1724 } 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
1725 // 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
1726 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
1727 } 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
1728 // 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
1729 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
1730 /*
a5004eb92a79 fix sub_select fiasco with global sub numbering. now multiple sub sources can be managed in essentially one list.
joey
parents: 13500
diff changeset
1731 } 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
1732 // 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
1733 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
1734 */
a5004eb92a79 fix sub_select fiasco with global sub numbering. now multiple sub sources can be managed in essentially one list.
joey
parents: 13500
diff changeset
1735 } 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
1736 // 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
1737 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
1738 }
a5004eb92a79 fix sub_select fiasco with global sub numbering. now multiple sub sources can be managed in essentially one list.
joey
parents: 13500
diff changeset
1739 // 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
1740 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
1741 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
1742 }
a5004eb92a79 fix sub_select fiasco with global sub numbering. now multiple sub sources can be managed in essentially one list.
joey
parents: 13500
diff changeset
1743
303
828ec81e0d64 codecs.conf support
arpi_esp
parents: 296
diff changeset
1744 //================== 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
1745 if(sh_audio){
303
828ec81e0d64 codecs.conf support
arpi_esp
parents: 296
diff changeset
1746 // 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
1747 current_module="init_audio_codec";
7202
b414c2e34b2e removed buggy fd<0 check for disallowing dumpstream/cache
arpi
parents: 7201
diff changeset
1748 mp_msg(MSGT_CPLAYER,MSGL_INFO,"==========================================================================\n");
7522
aa1a1249f239 -ac/-afm rewrite, now works the same way as -vc/-vfm
arpi
parents: 7517
diff changeset
1749 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
1750 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
1751 } else
7caeb275ad26 uninit cleanup again... thx to Nilmoni Deb for bugreport
arpi
parents: 7614
diff changeset
1752 inited_flags|=INITED_ACODEC;
7502
6a2b6f3d619c best audio/video codec selection & init moved to libmpcodecs
arpi
parents: 7495
diff changeset
1753 mp_msg(MSGT_CPLAYER,MSGL_INFO,"==========================================================================\n");
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1754 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1755
7864
dacc35bc92c7 add -identify switch
ranma
parents: 7854
diff changeset
1756 if(identify) {
dacc35bc92c7 add -identify switch
ranma
parents: 7854
diff changeset
1757 mp_msg(MSGT_GLOBAL,MSGL_INFO,"ID_FILENAME=%s\n", filename);
dacc35bc92c7 add -identify switch
ranma
parents: 7854
diff changeset
1758 if (sh_video) {
dacc35bc92c7 add -identify switch
ranma
parents: 7854
diff changeset
1759 /* Assume FOURCC if all bytes >= 0x20 (' ') */
dacc35bc92c7 add -identify switch
ranma
parents: 7854
diff changeset
1760 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
1761 mp_msg(MSGT_GLOBAL,MSGL_INFO,"ID_VIDEO_FORMAT=%.4s\n", &sh_video->format);
7864
dacc35bc92c7 add -identify switch
ranma
parents: 7854
diff changeset
1762 else
8672
9065fd98fad3 I've made some changes to the -identify handling. As previously the output
arpi
parents: 8644
diff changeset
1763 mp_msg(MSGT_GLOBAL,MSGL_INFO,"ID_VIDEO_FORMAT=0x%08X\n", sh_video->format);
7864
dacc35bc92c7 add -identify switch
ranma
parents: 7854
diff changeset
1764 mp_msg(MSGT_GLOBAL,MSGL_INFO,"ID_VIDEO_BITRATE=%d\n", sh_video->i_bps*8);
dacc35bc92c7 add -identify switch
ranma
parents: 7854
diff changeset
1765 mp_msg(MSGT_GLOBAL,MSGL_INFO,"ID_VIDEO_WIDTH=%d\n", sh_video->disp_w);
dacc35bc92c7 add -identify switch
ranma
parents: 7854
diff changeset
1766 mp_msg(MSGT_GLOBAL,MSGL_INFO,"ID_VIDEO_HEIGHT=%d\n", sh_video->disp_h);
dacc35bc92c7 add -identify switch
ranma
parents: 7854
diff changeset
1767 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
1768 mp_msg(MSGT_GLOBAL,MSGL_INFO,"ID_VIDEO_ASPECT=%1.4f\n", sh_video->aspect);
7864
dacc35bc92c7 add -identify switch
ranma
parents: 7854
diff changeset
1769 }
dacc35bc92c7 add -identify switch
ranma
parents: 7854
diff changeset
1770 if (sh_audio) {
dacc35bc92c7 add -identify switch
ranma
parents: 7854
diff changeset
1771 if (sh_audio->codec)
dacc35bc92c7 add -identify switch
ranma
parents: 7854
diff changeset
1772 mp_msg(MSGT_GLOBAL,MSGL_INFO, "ID_AUDIO_CODEC=%s\n", sh_audio->codec->name);
dacc35bc92c7 add -identify switch
ranma
parents: 7854
diff changeset
1773 /* Assume FOURCC if all bytes >= 0x20 (' ') */
dacc35bc92c7 add -identify switch
ranma
parents: 7854
diff changeset
1774 if (sh_audio->format >= 0x20202020)
dacc35bc92c7 add -identify switch
ranma
parents: 7854
diff changeset
1775 mp_msg(MSGT_GLOBAL,MSGL_INFO, "ID_AUDIO_FORMAT=%.4s\n", &sh_audio->format);
dacc35bc92c7 add -identify switch
ranma
parents: 7854
diff changeset
1776 else
dacc35bc92c7 add -identify switch
ranma
parents: 7854
diff changeset
1777 mp_msg(MSGT_GLOBAL,MSGL_INFO,"ID_AUDIO_FORMAT=%d\n", sh_audio->format);
dacc35bc92c7 add -identify switch
ranma
parents: 7854
diff changeset
1778 mp_msg(MSGT_GLOBAL,MSGL_INFO,"ID_AUDIO_BITRATE=%d\n", sh_audio->i_bps*8);
dacc35bc92c7 add -identify switch
ranma
parents: 7854
diff changeset
1779 mp_msg(MSGT_GLOBAL,MSGL_INFO,"ID_AUDIO_RATE=%d\n", sh_audio->samplerate);
dacc35bc92c7 add -identify switch
ranma
parents: 7854
diff changeset
1780 mp_msg(MSGT_GLOBAL,MSGL_INFO,"ID_AUDIO_NCH=%d\n", sh_audio->channels);
dacc35bc92c7 add -identify switch
ranma
parents: 7854
diff changeset
1781 }
8208
ae5a2ae1c349 demuxer_control(), percent position and time length query implemented in
arpi
parents: 8198
diff changeset
1782 mp_msg(MSGT_GLOBAL,MSGL_INFO,"ID_LENGTH=%ld\n", demuxer_get_time_length(demuxer));
7864
dacc35bc92c7 add -identify switch
ranma
parents: 7854
diff changeset
1783 }
dacc35bc92c7 add -identify switch
ranma
parents: 7854
diff changeset
1784
7502
6a2b6f3d619c best audio/video codec selection & init moved to libmpcodecs
arpi
parents: 7495
diff changeset
1785 if(!sh_video) goto main; // audio-only
175
d43c7e6412f0 added DirectShow support
arpi_esp
parents: 162
diff changeset
1786
303
828ec81e0d64 codecs.conf support
arpi_esp
parents: 296
diff changeset
1787 //================== Init VIDEO (codec & libvo) ==========================
7677
33562a65e9e8 _EXPERIMENTAL_ option: -fixed-vo for libvo spec compliance testing
arpi
parents: 7628
diff changeset
1788 if(!fixed_vo || !(inited_flags&INITED_VO)){
5154
f67115a72b7c init/uninit libvo/ao/getch2/cache2 order fixed
arpi
parents: 5151
diff changeset
1789 current_module="preinit_libvo";
f67115a72b7c init/uninit libvo/ao/getch2/cache2 order fixed
arpi
parents: 5151
diff changeset
1790
5511
7a24a067f0af vo_config_count now counts calls to vo->config()
arpi
parents: 5507
diff changeset
1791 vo_config_count=0;
7562
92188b57a062 video out driver list support (like -vc, example: -vo xmga,xv,x11,)
arpi
parents: 7559
diff changeset
1792 //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
1793 if(!(video_out=init_best_video_out(video_driver_list))){
6930
cae1dd6343e7 moved messages to help_mp-??.h
jaf
parents: 6921
diff changeset
1794 mp_msg(MSGT_CPLAYER,MSGL_FATAL,MSGTR_ErrorInitializingVODevice);
5154
f67115a72b7c init/uninit libvo/ao/getch2/cache2 order fixed
arpi
parents: 5151
diff changeset
1795 goto goto_next_file; // exit_player(MSGTR_Exit_error);
f67115a72b7c init/uninit libvo/ao/getch2/cache2 order fixed
arpi
parents: 5151
diff changeset
1796 }
5075
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5072
diff changeset
1797 sh_video->video_out=video_out;
5154
f67115a72b7c init/uninit libvo/ao/getch2/cache2 order fixed
arpi
parents: 5151
diff changeset
1798 inited_flags|=INITED_VO;
7677
33562a65e9e8 _EXPERIMENTAL_ option: -fixed-vo for libvo spec compliance testing
arpi
parents: 7628
diff changeset
1799 }
5154
f67115a72b7c init/uninit libvo/ao/getch2/cache2 order fixed
arpi
parents: 5151
diff changeset
1800
5507
d0d029fda134 video filter layer - written from scratch, but inspired a lot by Fredrik Kuivinen's patch
arpi
parents: 5489
diff changeset
1801 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
1802 {
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9563
diff changeset
1803 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
1804 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
1805 }
8198
1935017c0f71 Experimantal OSD menu
albeu
parents: 8164
diff changeset
1806 #ifdef HAVE_MENU
1935017c0f71 Experimantal OSD menu
albeu
parents: 8164
diff changeset
1807 if(use_menu) {
9593
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9563
diff changeset
1808 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
1809 vf_menu = vf_open_plugin(libmenu_vfs,sh_video->vfilter,"menu",vf_arg);
8198
1935017c0f71 Experimantal OSD menu
albeu
parents: 8164
diff changeset
1810 if(!vf_menu) {
13577
606d90e03a2f printf --> mp_msg conversion
diego
parents: 13502
diff changeset
1811 mp_msg(MSGT_CPLAYER,MSGL_ERR,MSGTR_CantOpenLibmenuFilterWithThisRootMenu,menu_root);
8198
1935017c0f71 Experimantal OSD menu
albeu
parents: 8164
diff changeset
1812 use_menu = 0;
1935017c0f71 Experimantal OSD menu
albeu
parents: 8164
diff changeset
1813 }
1935017c0f71 Experimantal OSD menu
albeu
parents: 8164
diff changeset
1814 }
1935017c0f71 Experimantal OSD menu
albeu
parents: 8164
diff changeset
1815 if(vf_menu)
1935017c0f71 Experimantal OSD menu
albeu
parents: 8164
diff changeset
1816 sh_video->vfilter=(void*)append_filters(vf_menu);
1935017c0f71 Experimantal OSD menu
albeu
parents: 8164
diff changeset
1817 else
1935017c0f71 Experimantal OSD menu
albeu
parents: 8164
diff changeset
1818 #endif
7559
b645204ea527 some cleanup - made private vars/funcs static, removed obsolete externs
arpi
parents: 7529
diff changeset
1819 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
1820
5154
f67115a72b7c init/uninit libvo/ao/getch2/cache2 order fixed
arpi
parents: 5151
diff changeset
1821 current_module="init_video_codec";
303
828ec81e0d64 codecs.conf support
arpi_esp
parents: 296
diff changeset
1822
5175
8354d89498d4 video codec selection redesigned and moved to libmpcodecs - now it's 'intelligent'
arpi
parents: 5154
diff changeset
1823 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
1824 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
1825 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
1826
8354d89498d4 video codec selection redesigned and moved to libmpcodecs - now it's 'intelligent'
arpi
parents: 5154
diff changeset
1827 if(!sh_video->inited){
7677
33562a65e9e8 _EXPERIMENTAL_ option: -fixed-vo for libvo spec compliance testing
arpi
parents: 7628
diff changeset
1828 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
1829 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
1830 sh_video = d_video->sh = NULL;
8354d89498d4 video codec selection redesigned and moved to libmpcodecs - now it's 'intelligent'
arpi
parents: 5154
diff changeset
1831 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
1832 }
8354d89498d4 video codec selection redesigned and moved to libmpcodecs - now it's 'intelligent'
arpi
parents: 5154
diff changeset
1833
7621
7caeb275ad26 uninit cleanup again... thx to Nilmoni Deb for bugreport
arpi
parents: 7614
diff changeset
1834 inited_flags|=INITED_VCODEC;
7caeb275ad26 uninit cleanup again... thx to Nilmoni Deb for bugreport
arpi
parents: 7614
diff changeset
1835
1439
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
1836 if(auto_quality>0){
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
1837 // Auto quality option enabled
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
1838 output_quality=get_video_quality_max(sh_video);
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
1839 if(auto_quality>output_quality) auto_quality=output_quality;
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
1840 else output_quality=auto_quality;
13577
606d90e03a2f printf --> mp_msg conversion
diego
parents: 13502
diff changeset
1841 mp_msg(MSGT_CPLAYER,MSGL_V,"AutoQ: setting quality to %d.\n",output_quality);
1439
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
1842 set_video_quality(sh_video,output_quality);
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
1843 }
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
1844
398
f5918fc8df10 more cleanup of video decoding
arpi_esp
parents: 396
diff changeset
1845 // ========== Init display (sh_video->disp_w*sh_video->disp_h/out_fmt) ============
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1846
6781
924263b4df10 eq reworked
alex
parents: 6755
diff changeset
1847 current_module="init_vo";
6755
a31b9f15cbff - fix audio equalizer
pontscho
parents: 6713
diff changeset
1848
6110
7bea806b9c5f Improvment for spu subtitles.
albeu
parents: 6082
diff changeset
1849 if(vo_flags & 0x08 && vo_spudec)
7bea806b9c5f Improvment for spu subtitles.
albeu
parents: 6082
diff changeset
1850 spudec_set_hw_spu(vo_spudec,video_out);
7bea806b9c5f Improvment for spu subtitles.
albeu
parents: 6082
diff changeset
1851
7122
0dc9cb756b68 freetype 2.0/2.1+ support - disabled by default until bugs fixed
arpi
parents: 7111
diff changeset
1852 #ifdef HAVE_FREETYPE
0dc9cb756b68 freetype 2.0/2.1+ support - disabled by default until bugs fixed
arpi
parents: 7111
diff changeset
1853 force_load_font = 1;
0dc9cb756b68 freetype 2.0/2.1+ support - disabled by default until bugs fixed
arpi
parents: 7111
diff changeset
1854 #endif
0dc9cb756b68 freetype 2.0/2.1+ support - disabled by default until bugs fixed
arpi
parents: 7111
diff changeset
1855
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1856 //================== MAIN: ==========================
7502
6a2b6f3d619c best audio/video codec selection & init moved to libmpcodecs
arpi
parents: 7495
diff changeset
1857 main:
6a2b6f3d619c best audio/video codec selection & init moved to libmpcodecs
arpi
parents: 7495
diff changeset
1858 current_module="main";
6a2b6f3d619c best audio/video codec selection & init moved to libmpcodecs
arpi
parents: 7495
diff changeset
1859
7516
657041b7236b when working through a mixed play tree with audi-only files and video files
arpi
parents: 7506
diff changeset
1860 // 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
1861 // 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
1862 // old OSD level after playing one or more audio-only files.
9304
1ec274153bec 1000l!!!!!!!!
arpi
parents: 9301
diff changeset
1863 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
1864 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
1865 osd_level = 0;
657041b7236b when working through a mixed play tree with audi-only files and video files
arpi
parents: 7506
diff changeset
1866 } 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
1867 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
1868 osd_level_saved = -1;
657041b7236b when working through a mixed play tree with audi-only files and video files
arpi
parents: 7506
diff changeset
1869 }
5151
610d399f50c3 - cleanup pass 1. more to come soon...
arpi
parents: 5138
diff changeset
1870
5154
f67115a72b7c init/uninit libvo/ao/getch2/cache2 order fixed
arpi
parents: 5151
diff changeset
1871 fflush(stdout);
5151
610d399f50c3 - cleanup pass 1. more to come soon...
arpi
parents: 5138
diff changeset
1872
5789
0132c5747e8a fix audio only files play
pontscho
parents: 5698
diff changeset
1873 #ifdef HAVE_NEW_GUI
0132c5747e8a fix audio only files play
pontscho
parents: 5698
diff changeset
1874 if ( use_gui )
0132c5747e8a fix audio only files play
pontscho
parents: 5698
diff changeset
1875 {
0132c5747e8a fix audio only files play
pontscho
parents: 5698
diff changeset
1876 if ( sh_audio ) guiIntfStruct.AudioType=sh_audio->channels; else guiIntfStruct.AudioType=0;
6796
9c828335b2d0 add preferences to gui
pontscho
parents: 6792
diff changeset
1877 if ( !sh_video && sh_audio ) guiGetEvent( guiSetAudioOnly,(char *)1 ); else guiGetEvent( guiSetAudioOnly,(char *)0 );
7009
98bed9e12087 - add dxr3 gui support (dialogbox, etc.)
pontscho
parents: 6971
diff changeset
1878 guiGetEvent( guiSetFileFormat,(char *)demuxer->file_format );
98bed9e12087 - add dxr3 gui support (dialogbox, etc.)
pontscho
parents: 6971
diff changeset
1879 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
1880 guiGetEvent( guiSetDemuxer,(char *)demuxer );
5789
0132c5747e8a fix audio only files play
pontscho
parents: 5698
diff changeset
1881 }
0132c5747e8a fix audio only files play
pontscho
parents: 5698
diff changeset
1882 #endif
0132c5747e8a fix audio only files play
pontscho
parents: 5698
diff changeset
1883
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1884 {
1420
d97816161256 removed obsolote frame_corr_* stuff
arpi
parents: 1410
diff changeset
1885 //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
1886 //float v_frame=0; // Video
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1887 float time_frame=0; // Timer
1400
2bf9c561b01d stage2 step 1
arpi
parents: 1382
diff changeset
1888 //float num_frames=0; // number of frames played
1382
9e8781a3eefc grab.mpg fixed
arpi
parents: 1375
diff changeset
1889 int grab_frames=0;
212
7034ef1f685d new option: -font
arpi_esp
parents: 208
diff changeset
1890 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
1891 char osd_show_text_buffer[64];
5612
027568c0f982 new -framedrop code - works much better than the old one
arpi
parents: 5610
diff changeset
1892 int drop_frame=0; // current dropping status
027568c0f982 new -framedrop code - works much better than the old one
arpi
parents: 5610
diff changeset
1893 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
1894 int too_slow_frame_cnt=0;
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
1895 int too_fast_frame_cnt=0;
1439
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
1896 // 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
1897 float AV_delay=0; // average of A-V timestamp differences
1439
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
1898 double vdecode_time;
6028
bd016664dc18 UMRs fixed - noticed by Nilmoni Deb <ndeb@ece.cmu.edu>
arpi
parents: 6016
diff changeset
1899 unsigned int lastframeout_ts=0;
8254
772d6d27fd66 warning patch by (Dominik Mierzejewski <dominik at rangers dot eu dot org>)
michael
parents: 8208
diff changeset
1900 /*float time_frame_corr_avg=0;*/ /* unused */
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1901
5929
9e7d54e7be58 - frame_time delayed one frame, as it's really duration of current frame,
arpi
parents: 5927
diff changeset
1902 float next_frame_time=0;
9e7d54e7be58 - frame_time delayed one frame, as it's really duration of current frame,
arpi
parents: 5927
diff changeset
1903 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
1904 int blit_frame=0;
9e7d54e7be58 - frame_time delayed one frame, as it's really duration of current frame,
arpi
parents: 5927
diff changeset
1905
6028
bd016664dc18 UMRs fixed - noticed by Nilmoni Deb <ndeb@ece.cmu.edu>
arpi
parents: 6016
diff changeset
1906 osd_text_buffer[0]=0;
bd016664dc18 UMRs fixed - noticed by Nilmoni Deb <ndeb@ece.cmu.edu>
arpi
parents: 6016
diff changeset
1907
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1908 //================ SETUP AUDIO ==========================
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1909
1369
7a2f1881b776 a_frame, v_frame killed, using sh_audio/video->timer. has_audio not more used after initialization.
arpi
parents: 1353
diff changeset
1910 if(sh_audio){
7563
e9e4398029de audio out driver list support (example: -ao alsa9,sdl:esd,oss,sdl:oss,)
arpi
parents: 7562
diff changeset
1911 //const ao_info_t *info=audio_out->info;
8995
865cbed58cf8 2-pass libaf initialization to get better filter chain.
arpi
parents: 8966
diff changeset
1912 current_module="af_preinit";
865cbed58cf8 2-pass libaf initialization to get better filter chain.
arpi
parents: 8966
diff changeset
1913 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
1914 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
1915 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
1916 #if 1
865cbed58cf8 2-pass libaf initialization to get better filter chain.
arpi
parents: 8966
diff changeset
1917 if(!preinit_audio_filters(sh_audio,
865cbed58cf8 2-pass libaf initialization to get better filter chain.
arpi
parents: 8966
diff changeset
1918 // input:
865cbed58cf8 2-pass libaf initialization to get better filter chain.
arpi
parents: 8966
diff changeset
1919 (int)(sh_audio->samplerate*playback_speed),
865cbed58cf8 2-pass libaf initialization to get better filter chain.
arpi
parents: 8966
diff changeset
1920 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
1921 // output:
865cbed58cf8 2-pass libaf initialization to get better filter chain.
arpi
parents: 8966
diff changeset
1922 &ao_data.samplerate, &ao_data.channels, &ao_data.format,
865cbed58cf8 2-pass libaf initialization to get better filter chain.
arpi
parents: 8966
diff changeset
1923 audio_out_format_bits(ao_data.format)/8)){
13577
606d90e03a2f printf --> mp_msg conversion
diego
parents: 13502
diff changeset
1924 mp_msg(MSGT_CPLAYER,MSGL_ERR,MSGTR_AudioFilterChainPreinitError);
8995
865cbed58cf8 2-pass libaf initialization to get better filter chain.
arpi
parents: 8966
diff changeset
1925 } else {
865cbed58cf8 2-pass libaf initialization to get better filter chain.
arpi
parents: 8966
diff changeset
1926 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
1927 ao_data.samplerate, ao_data.channels,
865cbed58cf8 2-pass libaf initialization to get better filter chain.
arpi
parents: 8966
diff changeset
1928 audio_out_format_name(ao_data.format));
865cbed58cf8 2-pass libaf initialization to get better filter chain.
arpi
parents: 8966
diff changeset
1929 }
865cbed58cf8 2-pass libaf initialization to get better filter chain.
arpi
parents: 8966
diff changeset
1930 #endif
7563
e9e4398029de audio out driver list support (example: -ao alsa9,sdl:esd,oss,sdl:oss,)
arpi
parents: 7562
diff changeset
1931 current_module="ao2_init";
e9e4398029de audio out driver list support (example: -ao alsa9,sdl:esd,oss,sdl:oss,)
arpi
parents: 7562
diff changeset
1932 if(!(audio_out=init_best_audio_out(audio_driver_list,
7731
1f8961f2b34c compiler warning fixes
arpi
parents: 7677
diff changeset
1933 (ao_plugin_cfg.plugin_list!=NULL), // plugin flag
8996
c5772dde2914 - restore old behaviour of -channels,-srate,-format
arpi
parents: 8995
diff changeset
1934 force_srate?force_srate:ao_data.samplerate,
c5772dde2914 - restore old behaviour of -channels,-srate,-format
arpi
parents: 8995
diff changeset
1935 audio_output_channels?audio_output_channels:ao_data.channels,
c5772dde2914 - restore old behaviour of -channels,-srate,-format
arpi
parents: 8995
diff changeset
1936 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
1937 // FAILED:
e9e4398029de audio out driver list support (example: -ao alsa9,sdl:esd,oss,sdl:oss,)
arpi
parents: 7562
diff changeset
1938 mp_msg(MSGT_CPLAYER,MSGL_ERR,MSGTR_CannotInitAO);
7621
7caeb275ad26 uninit cleanup again... thx to Nilmoni Deb for bugreport
arpi
parents: 7614
diff changeset
1939 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
1940 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
1941 } else {
e9e4398029de audio out driver list support (example: -ao alsa9,sdl:esd,oss,sdl:oss,)
arpi
parents: 7562
diff changeset
1942 // SUCCESS:
e9e4398029de audio out driver list support (example: -ao alsa9,sdl:esd,oss,sdl:oss,)
arpi
parents: 7562
diff changeset
1943 inited_flags|=INITED_AO;
8995
865cbed58cf8 2-pass libaf initialization to get better filter chain.
arpi
parents: 8966
diff changeset
1944 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
1945 audio_out->info->short_name,
8995
865cbed58cf8 2-pass libaf initialization to get better filter chain.
arpi
parents: 8966
diff changeset
1946 ao_data.samplerate, ao_data.channels,
865cbed58cf8 2-pass libaf initialization to get better filter chain.
arpi
parents: 8966
diff changeset
1947 audio_out_format_name(ao_data.format),
865cbed58cf8 2-pass libaf initialization to get better filter chain.
arpi
parents: 8966
diff changeset
1948 audio_out_format_bits(ao_data.format)/8 );
13577
606d90e03a2f printf --> mp_msg conversion
diego
parents: 13502
diff changeset
1949 mp_msg(MSGT_CPLAYER,MSGL_V,"AO: Description: %s\nAO: Author: %s\n",
7563
e9e4398029de audio out driver list support (example: -ao alsa9,sdl:esd,oss,sdl:oss,)
arpi
parents: 7562
diff changeset
1950 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
1951 if(strlen(audio_out->info->comment) > 0)
13577
606d90e03a2f printf --> mp_msg conversion
diego
parents: 13502
diff changeset
1952 mp_msg(MSGT_CPLAYER,MSGL_V,"AO: Comment: %s\n", audio_out->info->comment);
7604
32efb806436e aufio filter layer (libaf) integration to libmpcodecs, mplayer and mencoder
arpi
parents: 7582
diff changeset
1953 // init audio filters:
32efb806436e aufio filter layer (libaf) integration to libmpcodecs, mplayer and mencoder
arpi
parents: 7582
diff changeset
1954 #if 1
32efb806436e aufio filter layer (libaf) integration to libmpcodecs, mplayer and mencoder
arpi
parents: 7582
diff changeset
1955 current_module="af_init";
13710
d7af73cc38da allow changing playback speed during playback.
reimar
parents: 13684
diff changeset
1956 if(!build_afilter_chain(sh_audio, &ao_data)) {
13577
606d90e03a2f printf --> mp_msg conversion
diego
parents: 13502
diff changeset
1957 mp_msg(MSGT_CPLAYER,MSGL_ERR,MSGTR_NoMatchingFilter);
9128
c947458ad326 probably bad fix, but it's reported to fix hwac3 problems appeared in rc3
arpi
parents: 9124
diff changeset
1958 // mp_msg(MSGT_CPLAYER,MSGL_ERR,"Couldn't find matching filter / ao format! -> NOSOUND\n");
9045
417a20a4fc75 don't -nosound if libaf init failed (hwac3 fix)
arpi
parents: 9006
diff changeset
1959 // uninit_player(INITED_ACODEC|INITED_AO); // close codec & ao
417a20a4fc75 don't -nosound if libaf init failed (hwac3 fix)
arpi
parents: 9006
diff changeset
1960 // sh_audio=d_audio->sh=NULL; // -> nosound
7604
32efb806436e aufio filter layer (libaf) integration to libmpcodecs, mplayer and mencoder
arpi
parents: 7582
diff changeset
1961 }
32efb806436e aufio filter layer (libaf) integration to libmpcodecs, mplayer and mencoder
arpi
parents: 7582
diff changeset
1962 #endif
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1963 }
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
1964 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
1965 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
1966 mixer.volstep = volstep;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1967 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1968
5151
610d399f50c3 - cleanup pass 1. more to come soon...
arpi
parents: 5138
diff changeset
1969 current_module="av_init";
610d399f50c3 - cleanup pass 1. more to come soon...
arpi
parents: 5138
diff changeset
1970
610d399f50c3 - cleanup pass 1. more to come soon...
arpi
parents: 5138
diff changeset
1971 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
1972 if(sh_audio) sh_audio->delay=-audio_delay;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1973
1369
7a2f1881b776 a_frame, v_frame killed, using sh_audio/video->timer. has_audio not more used after initialization.
arpi
parents: 1353
diff changeset
1974 if(!sh_audio){
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_NoSound);
13684
af465f23bd1d 10l, patch by Jan Knutar <jknutar@nic.fi>
faust3
parents: 13626
diff changeset
1976 mp_msg(MSGT_CPLAYER,MSGL_V,"Freeing %d unused audio chunks.\n",d_audio->packs);
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1977 ds_free_packs(d_audio); // free buffered chunks
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1978 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
1979 //uninit_player(INITED_AO); // close device
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1980 }
5151
610d399f50c3 - cleanup pass 1. more to come soon...
arpi
parents: 5138
diff changeset
1981 if(!sh_video){
6930
cae1dd6343e7 moved messages to help_mp-??.h
jaf
parents: 6921
diff changeset
1982 mp_msg(MSGT_CPLAYER,MSGL_INFO,MSGTR_Video_NoVideo);
13684
af465f23bd1d 10l, patch by Jan Knutar <jknutar@nic.fi>
faust3
parents: 13626
diff changeset
1983 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
1984 ds_free_packs(d_video);
886bf5274992 Audio only support. Include a fix in the asf demuxer opening.
albeu
parents: 4552
diff changeset
1985 d_video->id=-2;
7677
33562a65e9e8 _EXPERIMENTAL_ option: -fixed-vo for libvo spec compliance testing
arpi
parents: 7628
diff changeset
1986 //if(!fixed_vo) uninit_player(INITED_VO);
5151
610d399f50c3 - cleanup pass 1. more to come soon...
arpi
parents: 5138
diff changeset
1987 }
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1988
6185
7e769ea2acc7 jump to next file (or exit) if can't decode audio && video
alex
parents: 6183
diff changeset
1989 if (!sh_video && !sh_audio)
7e769ea2acc7 jump to next file (or exit) if can't decode audio && video
alex
parents: 6183
diff changeset
1990 goto goto_next_file;
7e769ea2acc7 jump to next file (or exit) if can't decode audio && video
alex
parents: 6183
diff changeset
1991
8030
2b39ff3860b7 cleanup of .AVI timestamp calculation (ugly hack from mplayer.c removed,
arpi
parents: 8027
diff changeset
1992 //if(demuxer->file_format!=DEMUXER_TYPE_AVI) pts_from_bps=0; // it must be 0 for mpeg/asf!
7923
bad21f499a9e avoids segfaults w.r.t to mp3 files handling:
pl
parents: 7906
diff changeset
1993 if(force_fps && sh_video){
4598
badb76094897 setting vo_fps, required for vo_yuv4mpeg
arpi
parents: 4593
diff changeset
1994 vo_fps = sh_video->fps=force_fps;
398
f5918fc8df10 more cleanup of video decoding
arpi_esp
parents: 396
diff changeset
1995 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
1996 mp_msg(MSGT_CPLAYER,MSGL_INFO,MSGTR_FPSforced,sh_video->fps,sh_video->frametime);
398
f5918fc8df10 more cleanup of video decoding
arpi_esp
parents: 396
diff changeset
1997 }
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1998
1639
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
1999 //==================== START PLAYING =======================
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
2000
9105
9b387eae87e6 Secondly, fixed bug where -loop after file would play one too many times.
arpi
parents: 9090
diff changeset
2001 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
2002 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
2003
1582
12aa68bf2ff5 erros emssages moved to help_mp.h for translation
arpi
parents: 1567
diff changeset
2004 mp_msg(MSGT_CPLAYER,MSGL_INFO,MSGTR_StartPlaying);fflush(stdout);
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2005
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2006 InitTimer();
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2007
5489
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
2008 #ifdef USE_DVDNAV
9752
3db72324a0fe Stream cleanup, don't use blah_on options anymore.
albeu
parents: 9695
diff changeset
2009 if (stream->type==STREAMTYPE_DVDNAV) {
5489
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
2010 dvdnav_stream_fullstart((dvdnav_priv_t *)stream->priv);
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
2011 }
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
2012 #endif
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
2013
1124
0e95f30ffd4c -frames and -benchmark options to make chl & gabucino happy
arpi_esp
parents: 1059
diff changeset
2014 total_time_usage_start=GetTimer();
3934
e8e7ca8995a1 codecs.conf parser hangup fixed by iive, cpu usage reset at start
arpi
parents: 3843
diff changeset
2015 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
2016 total_frame_cnt=0; drop_frame_cnt=0; // fix for multifile fps benchmark
6590
bfc209bb3f48 -frames 0 fix, multifile frames support by tibcu
alex
parents: 6585
diff changeset
2017 play_n_frames=play_n_frames_mf;
bfc209bb3f48 -frames 0 fix, multifile frames support by tibcu
alex
parents: 6585
diff changeset
2018
bfc209bb3f48 -frames 0 fix, multifile frames support by tibcu
alex
parents: 6585
diff changeset
2019 if(play_n_frames==0){
bfc209bb3f48 -frames 0 fix, multifile frames support by tibcu
alex
parents: 6585
diff changeset
2020 eof=PT_NEXT_ENTRY; goto goto_next_file;
bfc209bb3f48 -frames 0 fix, multifile frames support by tibcu
alex
parents: 6585
diff changeset
2021 }
bfc209bb3f48 -frames 0 fix, multifile frames support by tibcu
alex
parents: 6585
diff changeset
2022
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2023 while(!eof){
1439
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
2024 float aq_sleep_time=0;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2025
1125
3ec8f4779e81 -frames 0 fixed
arpi_esp
parents: 1124
diff changeset
2026 if(play_n_frames>=0){
3ec8f4779e81 -frames 0 fixed
arpi_esp
parents: 1124
diff changeset
2027 --play_n_frames;
6954
8e991cd2e727 10l bug, noticed by Alexander Neundorf <neundorf@dellingsoft.de>
arpi
parents: 6940
diff changeset
2028 if(play_n_frames<0) eof = PT_NEXT_ENTRY;
1125
3ec8f4779e81 -frames 0 fixed
arpi_esp
parents: 1124
diff changeset
2029 }
3ec8f4779e81 -frames 0 fixed
arpi_esp
parents: 1124
diff changeset
2030
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2031 /*========================== PLAY AUDIO ============================*/
5610
fd196de4f1e9 cleanup. cosmetics only, no functional changes
arpi
parents: 5607
diff changeset
2032
1369
7a2f1881b776 a_frame, v_frame killed, using sh_audio/video->timer. has_audio not more used after initialization.
arpi
parents: 1353
diff changeset
2033 while(sh_audio){
746
cd1f0d4de0b8 new audio playback and A-V sync code
arpi_esp
parents: 723
diff changeset
2034 unsigned int t;
4834
fdb92826250c max & average benchmarks
nick
parents: 4833
diff changeset
2035 double tt;
2705
013e84f44cf5 libvo driver may have its own timing
arpi
parents: 2647
diff changeset
2036 int playsize;
5610
fd196de4f1e9 cleanup. cosmetics only, no functional changes
arpi
parents: 5607
diff changeset
2037
fd196de4f1e9 cleanup. cosmetics only, no functional changes
arpi
parents: 5607
diff changeset
2038 current_module="play_audio";
2705
013e84f44cf5 libvo driver may have its own timing
arpi
parents: 2647
diff changeset
2039
8056
324b6e5387be A-V sync cleanup: sh_audio->timer replaced by sh_audio->delay, it contains
arpi
parents: 8030
diff changeset
2040 ao_data.pts=((sh_video?sh_video->timer:0)+sh_audio->delay)*90000.0;
2705
013e84f44cf5 libvo driver may have its own timing
arpi
parents: 2647
diff changeset
2041 playsize=audio_out->get_space();
746
cd1f0d4de0b8 new audio playback and A-V sync code
arpi_esp
parents: 723
diff changeset
2042
5610
fd196de4f1e9 cleanup. cosmetics only, no functional changes
arpi
parents: 5607
diff changeset
2043 // handle audio-only case:
fd196de4f1e9 cleanup. cosmetics only, no functional changes
arpi
parents: 5607
diff changeset
2044 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
2045 usec_sleep(10000); // Wait a tick before retry
41d2da3bd082 Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents: 4818
diff changeset
2046 continue;
41d2da3bd082 Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents: 4818
diff changeset
2047 }
746
cd1f0d4de0b8 new audio playback and A-V sync code
arpi_esp
parents: 723
diff changeset
2048
cd1f0d4de0b8 new audio playback and A-V sync code
arpi_esp
parents: 723
diff changeset
2049 if(playsize>MAX_OUTBURST) playsize=MAX_OUTBURST; // we shouldn't exceed it!
5610
fd196de4f1e9 cleanup. cosmetics only, no functional changes
arpi
parents: 5607
diff changeset
2050
fd196de4f1e9 cleanup. cosmetics only, no functional changes
arpi
parents: 5607
diff changeset
2051 // Fill buffer if needed:
1639
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
2052 current_module="decode_audio"; // Enter AUDIO decoder module
746
cd1f0d4de0b8 new audio playback and A-V sync code
arpi_esp
parents: 723
diff changeset
2053 t=GetTimer();
7604
32efb806436e aufio filter layer (libaf) integration to libmpcodecs, mplayer and mencoder
arpi
parents: 7582
diff changeset
2054 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
2055 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
2056 playsize-sh_audio->a_out_buffer_len,sh_audio->a_out_buffer_size-sh_audio->a_out_buffer_len);
5610
fd196de4f1e9 cleanup. cosmetics only, no functional changes
arpi
parents: 5607
diff changeset
2057 if(ret<=0) break; // EOF?
7604
32efb806436e aufio filter layer (libaf) integration to libmpcodecs, mplayer and mencoder
arpi
parents: 7582
diff changeset
2058 sh_audio->a_out_buffer_len+=ret;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2059 }
4834
fdb92826250c max & average benchmarks
nick
parents: 4833
diff changeset
2060 t=GetTimer()-t;
5610
fd196de4f1e9 cleanup. cosmetics only, no functional changes
arpi
parents: 5607
diff changeset
2061 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
2062 if(playsize>sh_audio->a_out_buffer_len) playsize=sh_audio->a_out_buffer_len;
5610
fd196de4f1e9 cleanup. cosmetics only, no functional changes
arpi
parents: 5607
diff changeset
2063
fd196de4f1e9 cleanup. cosmetics only, no functional changes
arpi
parents: 5607
diff changeset
2064 // play audio:
fd196de4f1e9 cleanup. cosmetics only, no functional changes
arpi
parents: 5607
diff changeset
2065 current_module="play_audio";
7604
32efb806436e aufio filter layer (libaf) integration to libmpcodecs, mplayer and mencoder
arpi
parents: 7582
diff changeset
2066 playsize=audio_out->play(sh_audio->a_out_buffer,playsize,0);
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2067
955
3a3304cd9fd5 libao support
arpi_esp
parents: 940
diff changeset
2068 if(playsize>0){
7604
32efb806436e aufio filter layer (libaf) integration to libmpcodecs, mplayer and mencoder
arpi
parents: 7582
diff changeset
2069 sh_audio->a_out_buffer_len-=playsize;
32efb806436e aufio filter layer (libaf) integration to libmpcodecs, mplayer and mencoder
arpi
parents: 7582
diff changeset
2070 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
2071 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
2072 ao_data.bps : sh_audio->o_bps));
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2073 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2074
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2075 break;
5610
fd196de4f1e9 cleanup. cosmetics only, no functional changes
arpi
parents: 5607
diff changeset
2076 } // while(sh_audio)
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2077
4587
886bf5274992 Audio only support. Include a fix in the asf demuxer opening.
albeu
parents: 4552
diff changeset
2078 if(!sh_video) {
5610
fd196de4f1e9 cleanup. cosmetics only, no functional changes
arpi
parents: 5607
diff changeset
2079 // handle audio-only case:
10223
b89d03e939d6 display pts for audio-only files as hh:mm:ss.f
rfelker
parents: 10219
diff changeset
2080 if(!quiet) {
b89d03e939d6 display pts for audio-only files as hh:mm:ss.f
rfelker
parents: 10219
diff changeset
2081 //
b89d03e939d6 display pts for audio-only files as hh:mm:ss.f
rfelker
parents: 10219
diff changeset
2082 // convert time to HH:MM:SS.F format
b89d03e939d6 display pts for audio-only files as hh:mm:ss.f
rfelker
parents: 10219
diff changeset
2083 //
13094
7bcd674b13fb fix for audio position inaccuracy
joey
parents: 13092
diff changeset
2084 long tenths = 10 * (sh_audio->delay-audio_out->get_delay()*playback_speed);
10223
b89d03e939d6 display pts for audio-only files as hh:mm:ss.f
rfelker
parents: 10219
diff changeset
2085 int hh = (tenths / 36000) % 100;
b89d03e939d6 display pts for audio-only files as hh:mm:ss.f
rfelker
parents: 10219
diff changeset
2086 int mm = (tenths / 600) % 60;
b89d03e939d6 display pts for audio-only files as hh:mm:ss.f
rfelker
parents: 10219
diff changeset
2087 int ss = (tenths / 10) % 60;
b89d03e939d6 display pts for audio-only files as hh:mm:ss.f
rfelker
parents: 10219
diff changeset
2088 int f1 = tenths % 10;
b89d03e939d6 display pts for audio-only files as hh:mm:ss.f
rfelker
parents: 10219
diff changeset
2089 char hhmmssf[16]; // only really need 11, but just in case...
b89d03e939d6 display pts for audio-only files as hh:mm:ss.f
rfelker
parents: 10219
diff changeset
2090 sprintf( hhmmssf, "%2d:%2d:%2d.%1d", hh, mm, ss, f1);
b89d03e939d6 display pts for audio-only files as hh:mm:ss.f
rfelker
parents: 10219
diff changeset
2091 if (0 == hh) {
b89d03e939d6 display pts for audio-only files as hh:mm:ss.f
rfelker
parents: 10219
diff changeset
2092 hhmmssf[1] = ' ';
b89d03e939d6 display pts for audio-only files as hh:mm:ss.f
rfelker
parents: 10219
diff changeset
2093 hhmmssf[2] = ' ';
b89d03e939d6 display pts for audio-only files as hh:mm:ss.f
rfelker
parents: 10219
diff changeset
2094 }
b89d03e939d6 display pts for audio-only files as hh:mm:ss.f
rfelker
parents: 10219
diff changeset
2095 // uncomment the next three lines to show leading zero ten-hours
b89d03e939d6 display pts for audio-only files as hh:mm:ss.f
rfelker
parents: 10219
diff changeset
2096 // else if (' ' == hhmmssf[0]) {
b89d03e939d6 display pts for audio-only files as hh:mm:ss.f
rfelker
parents: 10219
diff changeset
2097 // hhmmssf[0] = '0';
b89d03e939d6 display pts for audio-only files as hh:mm:ss.f
rfelker
parents: 10219
diff changeset
2098 // }
b89d03e939d6 display pts for audio-only files as hh:mm:ss.f
rfelker
parents: 10219
diff changeset
2099 if ((0 == hh) && (0 == mm)) {
b89d03e939d6 display pts for audio-only files as hh:mm:ss.f
rfelker
parents: 10219
diff changeset
2100 hhmmssf[4] = ' ';
b89d03e939d6 display pts for audio-only files as hh:mm:ss.f
rfelker
parents: 10219
diff changeset
2101 hhmmssf[5] = ' ';
b89d03e939d6 display pts for audio-only files as hh:mm:ss.f
rfelker
parents: 10219
diff changeset
2102 }
b89d03e939d6 display pts for audio-only files as hh:mm:ss.f
rfelker
parents: 10219
diff changeset
2103 else if ((' ' == hhmmssf[3]) && (' ' != hhmmssf[2])) {
b89d03e939d6 display pts for audio-only files as hh:mm:ss.f
rfelker
parents: 10219
diff changeset
2104 hhmmssf[3] = '0';
b89d03e939d6 display pts for audio-only files as hh:mm:ss.f
rfelker
parents: 10219
diff changeset
2105 }
b89d03e939d6 display pts for audio-only files as hh:mm:ss.f
rfelker
parents: 10219
diff changeset
2106 if ((' ' == hhmmssf[6]) && (' ' != hhmmssf[5])) {
b89d03e939d6 display pts for audio-only files as hh:mm:ss.f
rfelker
parents: 10219
diff changeset
2107 hhmmssf[6] = '0';
b89d03e939d6 display pts for audio-only files as hh:mm:ss.f
rfelker
parents: 10219
diff changeset
2108 }
13710
d7af73cc38da allow changing playback speed during playback.
reimar
parents: 13684
diff changeset
2109 mp_msg(MSGT_AVSYNC,MSGL_STATUS,"A: %s %4.1f%% %d%% %4.2fx \r"
10223
b89d03e939d6 display pts for audio-only files as hh:mm:ss.f
rfelker
parents: 10219
diff changeset
2110 ,hhmmssf
8056
324b6e5387be A-V sync cleanup: sh_audio->timer replaced by sh_audio->delay, it contains
arpi
parents: 8030
diff changeset
2111 ,(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
2112 ,cache_fill_status
13742
ea5640a93a13 10l, missing playback_speed argument in mp_msg call.
reimar
parents: 13710
diff changeset
2113 ,playback_speed
4587
886bf5274992 Audio only support. Include a fix in the asf demuxer opening.
albeu
parents: 4552
diff changeset
2114 );
10223
b89d03e939d6 display pts for audio-only files as hh:mm:ss.f
rfelker
parents: 10219
diff changeset
2115 }
5610
fd196de4f1e9 cleanup. cosmetics only, no functional changes
arpi
parents: 5607
diff changeset
2116 if(d_audio->eof) eof = PT_NEXT_ENTRY;
fd196de4f1e9 cleanup. cosmetics only, no functional changes
arpi
parents: 5607
diff changeset
2117
fd196de4f1e9 cleanup. cosmetics only, no functional changes
arpi
parents: 5607
diff changeset
2118 } else {
4587
886bf5274992 Audio only support. Include a fix in the asf demuxer opening.
albeu
parents: 4552
diff changeset
2119
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2120 /*========================== PLAY VIDEO ============================*/
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2121
5929
9e7d54e7be58 - frame_time delayed one frame, as it's really duration of current frame,
arpi
parents: 5927
diff changeset
2122 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
2123
9e7d54e7be58 - frame_time delayed one frame, as it's really duration of current frame,
arpi
parents: 5927
diff changeset
2124 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
2125 vo_fps=sh_video->fps;
9e7d54e7be58 - frame_time delayed one frame, as it's really duration of current frame,
arpi
parents: 5927
diff changeset
2126
9e7d54e7be58 - frame_time delayed one frame, as it's really duration of current frame,
arpi
parents: 5927
diff changeset
2127 if(!frame_time_remaining){
2567
ea6158be8103 video frame reading cleanup
arpi
parents: 2563
diff changeset
2128 //-------------------- Decode a frame: -----------------------
ea6158be8103 video frame reading cleanup
arpi
parents: 2563
diff changeset
2129 vdecode_time=video_time_usage;
5698
cb47abf3b511 Fix loop playback. Main loop was quited on end of video.
albeu
parents: 5681
diff changeset
2130 while(1)
2567
ea6158be8103 video frame reading cleanup
arpi
parents: 2563
diff changeset
2131 { unsigned char* start=NULL;
ea6158be8103 video frame reading cleanup
arpi
parents: 2563
diff changeset
2132 int in_size;
ea6158be8103 video frame reading cleanup
arpi
parents: 2563
diff changeset
2133 // get it!
ea6158be8103 video frame reading cleanup
arpi
parents: 2563
diff changeset
2134 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
2135 in_size=video_read_frame(sh_video,&next_frame_time,&start,force_fps);
2567
ea6158be8103 video frame reading cleanup
arpi
parents: 2563
diff changeset
2136 if(in_size<0){ eof=1; break; }
ea6158be8103 video frame reading cleanup
arpi
parents: 2563
diff changeset
2137 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
2138 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
2139 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
2140 time_frame+=frame_time; // for nosound
027568c0f982 new -framedrop code - works much better than the old one
arpi
parents: 5610
diff changeset
2141 // check for frame-drop:
5643
3d9de27d9bd0 OSD handled by vf control()
arpi
parents: 5640
diff changeset
2142 current_module="check_framedrop";
5612
027568c0f982 new -framedrop code - works much better than the old one
arpi
parents: 5610
diff changeset
2143 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
2144 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
2145 float d=delay-sh_audio->delay;
5612
027568c0f982 new -framedrop code - works much better than the old one
arpi
parents: 5610
diff changeset
2146 // 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
2147 // 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
2148 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
2149 drop_frame=frame_dropping;
027568c0f982 new -framedrop code - works much better than the old one
arpi
parents: 5610
diff changeset
2150 ++drop_frame_cnt;
027568c0f982 new -framedrop code - works much better than the old one
arpi
parents: 5610
diff changeset
2151 ++dropped_frames;
027568c0f982 new -framedrop code - works much better than the old one
arpi
parents: 5610
diff changeset
2152 } else {
027568c0f982 new -framedrop code - works much better than the old one
arpi
parents: 5610
diff changeset
2153 drop_frame=dropped_frames=0;
027568c0f982 new -framedrop code - works much better than the old one
arpi
parents: 5610
diff changeset
2154 }
5621
0426f9b887cd some more statistics: BENCHMARKn
arpi
parents: 5612
diff changeset
2155 ++total_frame_cnt;
5612
027568c0f982 new -framedrop code - works much better than the old one
arpi
parents: 5610
diff changeset
2156 }
2567
ea6158be8103 video frame reading cleanup
arpi
parents: 2563
diff changeset
2157 // decode:
ea6158be8103 video frame reading cleanup
arpi
parents: 2563
diff changeset
2158 current_module="decode_video";
ea6158be8103 video frame reading cleanup
arpi
parents: 2563
diff changeset
2159 // 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
2160 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
2161 break;
1291
36ed1692c0b8 video codec stuff moved to dec_video.c
arpi
parents: 1289
diff changeset
2162 }
2567
ea6158be8103 video frame reading cleanup
arpi
parents: 2563
diff changeset
2163 vdecode_time=video_time_usage-vdecode_time;
ea6158be8103 video frame reading cleanup
arpi
parents: 2563
diff changeset
2164 //------------------------ frame decoded. --------------------
5610
fd196de4f1e9 cleanup. cosmetics only, no functional changes
arpi
parents: 5607
diff changeset
2165
fd196de4f1e9 cleanup. cosmetics only, no functional changes
arpi
parents: 5607
diff changeset
2166 mp_dbg(MSGT_AVSYNC,MSGL_DBG2,"*** ftime=%5.3f ***\n",frame_time);
fd196de4f1e9 cleanup. cosmetics only, no functional changes
arpi
parents: 5607
diff changeset
2167
5927
cffef9cc01bb catching vo/vf init failure
arpi
parents: 5910
diff changeset
2168 if(sh_video->vf_inited<0){
6930
cae1dd6343e7 moved messages to help_mp-??.h
jaf
parents: 6921
diff changeset
2169 mp_msg(MSGT_CPLAYER,MSGL_FATAL,MSGTR_NotInitializeVOPorVO);
5927
cffef9cc01bb catching vo/vf init failure
arpi
parents: 5910
diff changeset
2170 eof=1; goto goto_next_file;
cffef9cc01bb catching vo/vf init failure
arpi
parents: 5910
diff changeset
2171 }
cffef9cc01bb catching vo/vf init failure
arpi
parents: 5910
diff changeset
2172
5929
9e7d54e7be58 - frame_time delayed one frame, as it's really duration of current frame,
arpi
parents: 5927
diff changeset
2173 }
9e7d54e7be58 - frame_time delayed one frame, as it's really duration of current frame,
arpi
parents: 5927
diff changeset
2174
5610
fd196de4f1e9 cleanup. cosmetics only, no functional changes
arpi
parents: 5607
diff changeset
2175 // ==========================================================================
2567
ea6158be8103 video frame reading cleanup
arpi
parents: 2563
diff changeset
2176
5643
3d9de27d9bd0 OSD handled by vf control()
arpi
parents: 5640
diff changeset
2177 // current_module="draw_osd";
3d9de27d9bd0 OSD handled by vf control()
arpi
parents: 5640
diff changeset
2178 // if(vo_config_count) video_out->draw_osd();
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2179
5610
fd196de4f1e9 cleanup. cosmetics only, no functional changes
arpi
parents: 5607
diff changeset
2180 #ifdef HAVE_NEW_GUI
fd196de4f1e9 cleanup. cosmetics only, no functional changes
arpi
parents: 5607
diff changeset
2181 if(use_gui) guiEventHandling();
fd196de4f1e9 cleanup. cosmetics only, no functional changes
arpi
parents: 5607
diff changeset
2182 #endif
fd196de4f1e9 cleanup. cosmetics only, no functional changes
arpi
parents: 5607
diff changeset
2183
fd196de4f1e9 cleanup. cosmetics only, no functional changes
arpi
parents: 5607
diff changeset
2184 current_module="calc_sleep_time";
780
24e4e6e5aa1c audio sync cleanup and -bps fixed
arpi_esp
parents: 778
diff changeset
2185
5612
027568c0f982 new -framedrop code - works much better than the old one
arpi
parents: 5610
diff changeset
2186 #if 0
027568c0f982 new -framedrop code - works much better than the old one
arpi
parents: 5610
diff changeset
2187 { // debug frame dropping code
3097
81ea8a5488cc small change in mplayer.c and cfg-mplayer.h
anders
parents: 3054
diff changeset
2188 float delay=audio_out->get_delay();
5612
027568c0f982 new -framedrop code - works much better than the old one
arpi
parents: 5610
diff changeset
2189 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
2190 sh_video->timer,sh_audio->timer-delay,
027568c0f982 new -framedrop code - works much better than the old one
arpi
parents: 5610
diff changeset
2191 sh_video->timer-(sh_audio->timer-delay),
027568c0f982 new -framedrop code - works much better than the old one
arpi
parents: 5610
diff changeset
2192 delay,drop_frame);
027568c0f982 new -framedrop code - works much better than the old one
arpi
parents: 5610
diff changeset
2193 }
027568c0f982 new -framedrop code - works much better than the old one
arpi
parents: 5610
diff changeset
2194 #endif
027568c0f982 new -framedrop code - works much better than the old one
arpi
parents: 5610
diff changeset
2195
7576
c135f7646036 new opt: -autosync, controls ao->get_delay() smoothing (default: disabled)
arpi
parents: 7563
diff changeset
2196 if(drop_frame && !frame_time_remaining && !autosync){
c135f7646036 new opt: -autosync, controls ao->get_delay() smoothing (default: disabled)
arpi
parents: 7563
diff changeset
2197 /*
c135f7646036 new opt: -autosync, controls ao->get_delay() smoothing (default: disabled)
arpi
parents: 7563
diff changeset
2198 * 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
2199 * 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
2200 * 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
2201 * < 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
2202 * 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
2203 * 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
2204 * 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
2205 */
5610
fd196de4f1e9 cleanup. cosmetics only, no functional changes
arpi
parents: 5607
diff changeset
2206
fd196de4f1e9 cleanup. cosmetics only, no functional changes
arpi
parents: 5607
diff changeset
2207 time_frame=0; // don't sleep!
fd196de4f1e9 cleanup. cosmetics only, no functional changes
arpi
parents: 5607
diff changeset
2208 blit_frame=0; // don't display!
fd196de4f1e9 cleanup. cosmetics only, no functional changes
arpi
parents: 5607
diff changeset
2209
798
cfb984ecb5fd frame dropping...
arpi_esp
parents: 795
diff changeset
2210 } else {
5612
027568c0f982 new -framedrop code - works much better than the old one
arpi
parents: 5610
diff changeset
2211
780
24e4e6e5aa1c audio sync cleanup and -bps fixed
arpi_esp
parents: 778
diff changeset
2212 // It's time to sleep...
5612
027568c0f982 new -framedrop code - works much better than the old one
arpi
parents: 5610
diff changeset
2213
5929
9e7d54e7be58 - frame_time delayed one frame, as it's really duration of current frame,
arpi
parents: 5927
diff changeset
2214 frame_time_remaining=0;
780
24e4e6e5aa1c audio sync cleanup and -bps fixed
arpi_esp
parents: 778
diff changeset
2215 time_frame-=GetRelativeTime(); // reset timer
24e4e6e5aa1c audio sync cleanup and -bps fixed
arpi_esp
parents: 778
diff changeset
2216
1369
7a2f1881b776 a_frame, v_frame killed, using sh_audio/video->timer. has_audio not more used after initialization.
arpi
parents: 1353
diff changeset
2217 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
2218 float delay=playback_speed*audio_out->get_delay();
3097
81ea8a5488cc small change in mplayer.c and cfg-mplayer.h
anders
parents: 3054
diff changeset
2219 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
2220
7576
c135f7646036 new opt: -autosync, controls ao->get_delay() smoothing (default: disabled)
arpi
parents: 7563
diff changeset
2221 if (autosync){
c135f7646036 new opt: -autosync, controls ao->get_delay() smoothing (default: disabled)
arpi
parents: 7563
diff changeset
2222 /*
c135f7646036 new opt: -autosync, controls ao->get_delay() smoothing (default: disabled)
arpi
parents: 7563
diff changeset
2223 * 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
2224 * 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
2225 * 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
2226 * 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
2227 * 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
2228 * 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
2229 * 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
2230 */
8056
324b6e5387be A-V sync cleanup: sh_audio->timer replaced by sh_audio->delay, it contains
arpi
parents: 8030
diff changeset
2231 float predicted = sh_audio->delay+time_frame;
7576
c135f7646036 new opt: -autosync, controls ao->get_delay() smoothing (default: disabled)
arpi
parents: 7563
diff changeset
2232 float difference = delay - predicted;
c135f7646036 new opt: -autosync, controls ao->get_delay() smoothing (default: disabled)
arpi
parents: 7563
diff changeset
2233 delay = predicted + difference / (float)autosync;
c135f7646036 new opt: -autosync, controls ao->get_delay() smoothing (default: disabled)
arpi
parents: 7563
diff changeset
2234 }
c135f7646036 new opt: -autosync, controls ao->get_delay() smoothing (default: disabled)
arpi
parents: 7563
diff changeset
2235
8056
324b6e5387be A-V sync cleanup: sh_audio->timer replaced by sh_audio->delay, it contains
arpi
parents: 8030
diff changeset
2236 time_frame=delay-sh_audio->delay;
3097
81ea8a5488cc small change in mplayer.c and cfg-mplayer.h
anders
parents: 3054
diff changeset
2237
7495
12b2c735ad07 removed -dapsync (obsolete code)
arpi
parents: 7494
diff changeset
2238 // 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
2239 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
2240 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
2241 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
2242 // 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
2243 frame_time_remaining=1;
9e7d54e7be58 - frame_time delayed one frame, as it's really duration of current frame,
arpi
parents: 5927
diff changeset
2244 time_frame=delay*0.5;
9e7d54e7be58 - frame_time delayed one frame, as it's really duration of current frame,
arpi
parents: 5927
diff changeset
2245 }
9e7d54e7be58 - frame_time delayed one frame, as it's really duration of current frame,
arpi
parents: 5927
diff changeset
2246
780
24e4e6e5aa1c audio sync cleanup and -bps fixed
arpi_esp
parents: 778
diff changeset
2247 } else {
5610
fd196de4f1e9 cleanup. cosmetics only, no functional changes
arpi
parents: 5607
diff changeset
2248
2889
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
2249 // NOSOUND:
1124
0e95f30ffd4c -frames and -benchmark options to make chl & gabucino happy
arpi_esp
parents: 1059
diff changeset
2250 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
2251 time_frame=0;
0e95f30ffd4c -frames and -benchmark options to make chl & gabucino happy
arpi_esp
parents: 1059
diff changeset
2252
780
24e4e6e5aa1c audio sync cleanup and -bps fixed
arpi_esp
parents: 778
diff changeset
2253 }
798
cfb984ecb5fd frame dropping...
arpi_esp
parents: 795
diff changeset
2254
1369
7a2f1881b776 a_frame, v_frame killed, using sh_audio/video->timer. has_audio not more used after initialization.
arpi
parents: 1353
diff changeset
2255 // if(verbose>1)printf("sleep: %5.3f a:%6.3f v:%6.3f \n",time_frame,sh_audio->timer,sh_video->timer);
1439
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
2256
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
2257 aq_sleep_time+=time_frame;
1709
a4e0211455d8 GUI integration, step 1
arpi
parents: 1694
diff changeset
2258
5610
fd196de4f1e9 cleanup. cosmetics only, no functional changes
arpi
parents: 5607
diff changeset
2259 } // !drop_frame
fd196de4f1e9 cleanup. cosmetics only, no functional changes
arpi
parents: 5607
diff changeset
2260
fd196de4f1e9 cleanup. cosmetics only, no functional changes
arpi
parents: 5607
diff changeset
2261 //============================== SLEEP: ===================================
fd196de4f1e9 cleanup. cosmetics only, no functional changes
arpi
parents: 5607
diff changeset
2262
8068
a9e2956905e6 scale sleep time too (-speed)
arpi
parents: 8056
diff changeset
2263 time_frame/=playback_speed;
a9e2956905e6 scale sleep time too (-speed)
arpi
parents: 8056
diff changeset
2264
5610
fd196de4f1e9 cleanup. cosmetics only, no functional changes
arpi
parents: 5607
diff changeset
2265 // flag 256 means: libvo driver does its timing (dvb card)
fd196de4f1e9 cleanup. cosmetics only, no functional changes
arpi
parents: 5607
diff changeset
2266 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
2267
3015
8bf21c807656 RTC is autodetected
arpi
parents: 2941
diff changeset
2268 #ifdef HAVE_RTC
2889
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
2269 if(rtc_fd>=0){
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
2270 // -------- RTC -----------
5610
fd196de4f1e9 cleanup. cosmetics only, no functional changes
arpi
parents: 5607
diff changeset
2271 current_module="sleep_rtc";
2889
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
2272 while (time_frame > 0.000) {
7494
229287c14cd4 RTC fixes by Sidik Isani <lksi@cfht.hawaii.edu>
arpi
parents: 7486
diff changeset
2273 unsigned long rtc_ts;
2889
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
2274 if (read (rtc_fd, &rtc_ts, sizeof(rtc_ts)) <= 0)
13577
606d90e03a2f printf --> mp_msg conversion
diego
parents: 13502
diff changeset
2275 mp_msg(MSGT_CPLAYER, MSGL_ERR, MSGTR_LinuxRTCReadError, strerror(errno));
2889
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
2276 time_frame-=GetRelativeTime();
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
2277 }
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
2278 } else
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
2279 #endif
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
2280 {
12954
f9755d9c479a Native darwin timer update.
wight
parents: 12893
diff changeset
2281 // -------- TIMER + SOFTSLEEP -----------
2889
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
2282 float min=softsleep?0.021:0.005;
12954
f9755d9c479a Native darwin timer update.
wight
parents: 12893
diff changeset
2283 current_module="sleep_timer";
2889
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
2284 while(time_frame>min){
746
cd1f0d4de0b8 new audio playback and A-V sync code
arpi_esp
parents: 723
diff changeset
2285 if(time_frame<=0.020)
1439
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
2286 usec_sleep(0); // sleeps 1 clock tick (10ms)!
746
cd1f0d4de0b8 new audio playback and A-V sync code
arpi_esp
parents: 723
diff changeset
2287 else
2757
b8b92c4afa22 fixed usleep() - 10l?
arpi
parents: 2705
diff changeset
2288 usec_sleep(1000000*(time_frame-0.020));
746
cd1f0d4de0b8 new audio playback and A-V sync code
arpi_esp
parents: 723
diff changeset
2289 time_frame-=GetRelativeTime();
2889
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
2290 }
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
2291 if(softsleep){
5610
fd196de4f1e9 cleanup. cosmetics only, no functional changes
arpi
parents: 5607
diff changeset
2292 current_module="sleep_soft";
13577
606d90e03a2f printf --> mp_msg conversion
diego
parents: 13502
diff changeset
2293 if(time_frame<0) mp_msg(MSGT_AVSYNC, MSGL_WARN, MSGTR_SoftsleepUnderflow);
2889
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
2294 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
2295 }
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
2296 }
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
2297
2705
013e84f44cf5 libvo driver may have its own timing
arpi
parents: 2647
diff changeset
2298 }
117
b21b7c2fa180 common vo->flip_page() call
arpi_esp
parents: 112
diff changeset
2299
5929
9e7d54e7be58 - frame_time delayed one frame, as it's really duration of current frame,
arpi
parents: 5927
diff changeset
2300 //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
2301
5610
fd196de4f1e9 cleanup. cosmetics only, no functional changes
arpi
parents: 5607
diff changeset
2302 //====================== FLIP PAGE (VIDEO BLT): =========================
fd196de4f1e9 cleanup. cosmetics only, no functional changes
arpi
parents: 5607
diff changeset
2303
6123
d5606e4d0280 module name fixed for vo check_events
arpi
parents: 6112
diff changeset
2304 current_module="vo_check_events";
d5606e4d0280 module name fixed for vo check_events
arpi
parents: 6112
diff changeset
2305 if(vo_config_count) video_out->check_events();
d5606e4d0280 module name fixed for vo check_events
arpi
parents: 6112
diff changeset
2306
715
2bd7c16d89e1 frame dropping hack
arpi_esp
parents: 701
diff changeset
2307 current_module="flip_page";
8450
8cfc9309f0cc notice vo driver about skipped/dropped frames
arpi
parents: 8423
diff changeset
2308 if (!frame_time_remaining) {
8cfc9309f0cc notice vo driver about skipped/dropped frames
arpi
parents: 8423
diff changeset
2309 if(blit_frame){
1962
a0bd07b10667 fixed VO time usage (now including page-flip)
arpi
parents: 1953
diff changeset
2310 unsigned int t2=GetTimer();
4838
5129860a980e frame dropping prediction with benchmarks
nick
parents: 4835
diff changeset
2311 double tt;
2889
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
2312 float j;
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
2313 #define FRAME_LAG_WARN 0.2
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
2314 j = ((float)t2 - lastframeout_ts) / 1000000;
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
2315 lastframeout_ts = GetTimer();
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
2316 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
2317 too_fast_frame_cnt++;
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
2318 /* printf ("PANIC: too fast frame (%.3f)!\n", j); */
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
2319 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
2320 too_slow_frame_cnt++;
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
2321 /* printf ("PANIC: too slow frame (%.3f)!\n", j); */
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
2322
5511
7a24a067f0af vo_config_count now counts calls to vo->config()
arpi
parents: 5507
diff changeset
2323 if(vo_config_count) video_out->flip_page();
5610
fd196de4f1e9 cleanup. cosmetics only, no functional changes
arpi
parents: 5607
diff changeset
2324 // usec_sleep(50000); // test only!
4838
5129860a980e frame dropping prediction with benchmarks
nick
parents: 4835
diff changeset
2325 t2=GetTimer()-t2;
5129860a980e frame dropping prediction with benchmarks
nick
parents: 4835
diff changeset
2326 tt = t2*0.000001f;
5129860a980e frame dropping prediction with benchmarks
nick
parents: 4835
diff changeset
2327 vout_time_usage+=tt;
8450
8cfc9309f0cc notice vo driver about skipped/dropped frames
arpi
parents: 8423
diff changeset
2328 } else {
8cfc9309f0cc notice vo driver about skipped/dropped frames
arpi
parents: 8423
diff changeset
2329 /*
8cfc9309f0cc notice vo driver about skipped/dropped frames
arpi
parents: 8423
diff changeset
2330 Well, no blitting is needed, but some devices (such as yuv4mpeg) must output frame
8cfc9309f0cc notice vo driver about skipped/dropped frames
arpi
parents: 8423
diff changeset
2331 otherwise A/V desync will occur. -- Alvieboy
8cfc9309f0cc notice vo driver about skipped/dropped frames
arpi
parents: 8423
diff changeset
2332 */
8cfc9309f0cc notice vo driver about skipped/dropped frames
arpi
parents: 8423
diff changeset
2333 if (vo_config_count)
8cfc9309f0cc notice vo driver about skipped/dropped frames
arpi
parents: 8423
diff changeset
2334 video_out->control(VOCTRL_DUPLICATE_FRAME, NULL);
8cfc9309f0cc notice vo driver about skipped/dropped frames
arpi
parents: 8423
diff changeset
2335 }
8cfc9309f0cc notice vo driver about skipped/dropped frames
arpi
parents: 8423
diff changeset
2336 }
5610
fd196de4f1e9 cleanup. cosmetics only, no functional changes
arpi
parents: 5607
diff changeset
2337 //====================== A-V TIMESTAMP CORRECTION: =========================
fd196de4f1e9 cleanup. cosmetics only, no functional changes
arpi
parents: 5607
diff changeset
2338
fd196de4f1e9 cleanup. cosmetics only, no functional changes
arpi
parents: 5607
diff changeset
2339 current_module="av_sync";
fd196de4f1e9 cleanup. cosmetics only, no functional changes
arpi
parents: 5607
diff changeset
2340
1369
7a2f1881b776 a_frame, v_frame killed, using sh_audio/video->timer. has_audio not more used after initialization.
arpi
parents: 1353
diff changeset
2341 if(sh_audio){
780
24e4e6e5aa1c audio sync cleanup and -bps fixed
arpi_esp
parents: 778
diff changeset
2342 float a_pts=0;
24e4e6e5aa1c audio sync cleanup and -bps fixed
arpi_esp
parents: 778
diff changeset
2343 float v_pts=0;
24e4e6e5aa1c audio sync cleanup and -bps fixed
arpi_esp
parents: 778
diff changeset
2344
746
cd1f0d4de0b8 new audio playback and A-V sync code
arpi_esp
parents: 723
diff changeset
2345 // 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
2346 float delay=playback_speed*audio_out->get_delay()+(float)sh_audio->a_buffer_len/(float)sh_audio->o_bps;
746
cd1f0d4de0b8 new audio playback and A-V sync code
arpi_esp
parents: 723
diff changeset
2347
7576
c135f7646036 new opt: -autosync, controls ao->get_delay() smoothing (default: disabled)
arpi
parents: 7563
diff changeset
2348 if (autosync){
c135f7646036 new opt: -autosync, controls ao->get_delay() smoothing (default: disabled)
arpi
parents: 7563
diff changeset
2349 /*
c135f7646036 new opt: -autosync, controls ao->get_delay() smoothing (default: disabled)
arpi
parents: 7563
diff changeset
2350 * 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
2351 * 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
2352 * 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
2353 * 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
2354 * 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
2355 * 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
2356 * 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
2357 * 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
2358 * autosync mode.)
c135f7646036 new opt: -autosync, controls ao->get_delay() smoothing (default: disabled)
arpi
parents: 7563
diff changeset
2359 */
8056
324b6e5387be A-V sync cleanup: sh_audio->timer replaced by sh_audio->delay, it contains
arpi
parents: 8030
diff changeset
2360 delay=sh_audio->delay;
7576
c135f7646036 new opt: -autosync, controls ao->get_delay() smoothing (default: disabled)
arpi
parents: 7563
diff changeset
2361 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
2362 }
c135f7646036 new opt: -autosync, controls ao->get_delay() smoothing (default: disabled)
arpi
parents: 7563
diff changeset
2363
8030
2b39ff3860b7 cleanup of .AVI timestamp calculation (ugly hack from mplayer.c removed,
arpi
parents: 8027
diff changeset
2364 #if 0
780
24e4e6e5aa1c audio sync cleanup and -bps fixed
arpi_esp
parents: 778
diff changeset
2365 if(pts_from_bps){
5610
fd196de4f1e9 cleanup. cosmetics only, no functional changes
arpi
parents: 5607
diff changeset
2366 // PTS = sample_no / samplerate
7735
197cee6aa59e always use rounded-up blocksize for .avi files (fixes Firestarter.mpg.avi)
arpi
parents: 7731
diff changeset
2367 unsigned int samples=
197cee6aa59e always use rounded-up blocksize for .avi files (fixes Firestarter.mpg.avi)
arpi
parents: 7731
diff changeset
2368 // (sh_audio->audio.dwSampleSize)?
197cee6aa59e always use rounded-up blocksize for .avi files (fixes Firestarter.mpg.avi)
arpi
parents: 7731
diff changeset
2369 // ((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
2370 ds_tell_block(d_audio); // <- used for VBR audio
3302
e75454b489df using audio.dwStart too... (for baittest.avi)
arpi
parents: 3274
diff changeset
2371 samples+=sh_audio->audio.dwStart; // offset
1498
6174b815b5f4 PTS calc updates, fixes, cleanups, mess...
arpi
parents: 1497
diff changeset
2372 a_pts=samples*(float)sh_audio->audio.dwScale/(float)sh_audio->audio.dwRate;
5610
fd196de4f1e9 cleanup. cosmetics only, no functional changes
arpi
parents: 5607
diff changeset
2373 delay_corrected=1;
7749
48bf03297d48 more accurate a_pts calculation in AVI -bps (default) mode
arpi
parents: 7735
diff changeset
2374 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
2375 } else
2b39ff3860b7 cleanup of .AVI timestamp calculation (ugly hack from mplayer.c removed,
arpi
parents: 8027
diff changeset
2376 #endif
2b39ff3860b7 cleanup of .AVI timestamp calculation (ugly hack from mplayer.c removed,
arpi
parents: 8027
diff changeset
2377 {
780
24e4e6e5aa1c audio sync cleanup and -bps fixed
arpi_esp
parents: 778
diff changeset
2378 // PTS = (last timestamp) + (bytes after last timestamp)/(bytes per sec)
746
cd1f0d4de0b8 new audio playback and A-V sync code
arpi_esp
parents: 723
diff changeset
2379 a_pts=d_audio->pts;
1498
6174b815b5f4 PTS calc updates, fixes, cleanups, mess...
arpi
parents: 1497
diff changeset
2380 if(!delay_corrected) if(a_pts) delay_corrected=1;
6429
bff56f37f2ff 10l typo, noticed by Nick K.
arpi
parents: 6311
diff changeset
2381 #if 0
13577
606d90e03a2f printf --> mp_msg conversion
diego
parents: 13502
diff changeset
2382 mp_msg(MSGT_FIXME, MSGL_FIXME, "\n#X# pts=%5.3f ds_pts=%5.3f buff=%5.3f total=%5.3f\n",
6429
bff56f37f2ff 10l typo, noticed by Nick K.
arpi
parents: 6311
diff changeset
2383 a_pts,
bff56f37f2ff 10l typo, noticed by Nick K.
arpi
parents: 6311
diff changeset
2384 ds_tell_pts(d_audio)/(float)sh_audio->i_bps,
bff56f37f2ff 10l typo, noticed by Nick K.
arpi
parents: 6311
diff changeset
2385 -sh_audio->a_in_buffer_len/(float)sh_audio->i_bps,
bff56f37f2ff 10l typo, noticed by Nick K.
arpi
parents: 6311
diff changeset
2386 a_pts+(ds_tell_pts(d_audio)-sh_audio->a_in_buffer_len)/(float)sh_audio->i_bps);
bff56f37f2ff 10l typo, noticed by Nick K.
arpi
parents: 6311
diff changeset
2387 #endif
746
cd1f0d4de0b8 new audio playback and A-V sync code
arpi_esp
parents: 723
diff changeset
2388 a_pts+=(ds_tell_pts(d_audio)-sh_audio->a_in_buffer_len)/(float)sh_audio->i_bps;
780
24e4e6e5aa1c audio sync cleanup and -bps fixed
arpi_esp
parents: 778
diff changeset
2389 }
8965
14fa6a121a47 fixed the well-known DVD/DVB audio delay bug :)
arpi
parents: 8937
diff changeset
2390 v_pts=sh_video ? sh_video->pts : d_video->pts;
746
cd1f0d4de0b8 new audio playback and A-V sync code
arpi_esp
parents: 723
diff changeset
2391
1567
5c7760aa4f94 printf->mp_msg/mp_dbg
arpi
parents: 1564
diff changeset
2392 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
24e4e6e5aa1c audio sync cleanup and -bps fixed
arpi_esp
parents: 778
diff changeset
2393
398
f5918fc8df10 more cleanup of video decoding
arpi_esp
parents: 396
diff changeset
2394 if(delay_corrected){
6173
020bfd8ac9ef - put back SystemTooSlow message
arpi
parents: 6138
diff changeset
2395 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
2396 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
2397 AV_delay=(a_pts-delay-audio_delay)-v_pts;
11254
f42b8a99a5e0 make 'your system is too slow' appear only once
iive
parents: 11243
diff changeset
2398 if(AV_delay>0.5 && drop_frame_cnt>50 && drop_message==0){
6173
020bfd8ac9ef - put back SystemTooSlow message
arpi
parents: 6138
diff changeset
2399 ++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
2400 mp_msg(MSGT_AVSYNC,MSGL_WARN,MSGTR_SystemTooSlow);
6173
020bfd8ac9ef - put back SystemTooSlow message
arpi
parents: 6138
diff changeset
2401 }
1478
6f9167f0fcca 'too slow' message is fixed - better detection now based on both drop_cnt and A-V sync
arpi
parents: 1467
diff changeset
2402 x=AV_delay*0.1f;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2403 if(x<-max_pts_correction) x=-max_pts_correction; else
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2404 if(x> max_pts_correction) x= max_pts_correction;
780
24e4e6e5aa1c audio sync cleanup and -bps fixed
arpi_esp
parents: 778
diff changeset
2405 if(default_max_pts_correction>=0)
24e4e6e5aa1c audio sync cleanup and -bps fixed
arpi_esp
parents: 778
diff changeset
2406 max_pts_correction=default_max_pts_correction;
24e4e6e5aa1c audio sync cleanup and -bps fixed
arpi_esp
parents: 778
diff changeset
2407 else
24e4e6e5aa1c audio sync cleanup and -bps fixed
arpi_esp
parents: 778
diff changeset
2408 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
2409 if(!frame_time_remaining){ sh_audio->delay+=x; c_total+=x;} // correction
13710
d7af73cc38da allow changing playback speed during playback.
reimar
parents: 13684
diff changeset
2410 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%% %4.2fx\r",
1498
6174b815b5f4 PTS calc updates, fixes, cleanups, mess...
arpi
parents: 1497
diff changeset
2411 a_pts-audio_delay-delay,v_pts,AV_delay,c_total,
1546
d4cd08b06665 display number of decoded frames (for progr. mpeg2)
arpi
parents: 1504
diff changeset
2412 (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
2413 (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
2414 (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
2415 (sh_video->timer>0.5)?(100.0*audio_time_usage*playback_speed/(double)sh_video->timer):0
1498
6174b815b5f4 PTS calc updates, fixes, cleanups, mess...
arpi
parents: 1497
diff changeset
2416 ,drop_frame_cnt
6174b815b5f4 PTS calc updates, fixes, cleanups, mess...
arpi
parents: 1497
diff changeset
2417 ,output_quality
2353
a3daec6c49e4 cache full status added
arpi
parents: 2342
diff changeset
2418 ,cache_fill_status
13710
d7af73cc38da allow changing playback speed during playback.
reimar
parents: 13684
diff changeset
2419 ,playback_speed
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2420 );
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2421 fflush(stdout);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2422 }
780
24e4e6e5aa1c audio sync cleanup and -bps fixed
arpi_esp
parents: 778
diff changeset
2423
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2424 } else {
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2425 // No audio:
1420
d97816161256 removed obsolote frame_corr_* stuff
arpi
parents: 1410
diff changeset
2426
1448
e795527de16a -quiet option patch by Adam Tla/lka atlka@pg.gda.pl
arpi
parents: 1439
diff changeset
2427 if(!quiet)
8966
arpi
parents: 8965
diff changeset
2428 mp_msg(MSGT_AVSYNC,MSGL_STATUS,"V:%6.1f %3d %2d%% %2d%% %4.1f%% %d %d %d%%\r",sh_video->pts,
1400
2bf9c561b01d stage2 step 1
arpi
parents: 1382
diff changeset
2429 (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
2430 (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
2431 (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
2432 (sh_video->timer>0.5)?(100.0*audio_time_usage/(double)sh_video->timer):0
2353
a3daec6c49e4 cache full status added
arpi
parents: 2342
diff changeset
2433 ,drop_frame_cnt
a3daec6c49e4 cache full status added
arpi
parents: 2342
diff changeset
2434 ,output_quality
a3daec6c49e4 cache full status added
arpi
parents: 2342
diff changeset
2435 ,cache_fill_status
442
0828c5d13418 fixed mplayer.c
gabucino
parents: 440
diff changeset
2436 );
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2437
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2438 fflush(stdout);
1420
d97816161256 removed obsolote frame_corr_* stuff
arpi
parents: 1410
diff changeset
2439
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2440 }
5610
fd196de4f1e9 cleanup. cosmetics only, no functional changes
arpi
parents: 5607
diff changeset
2441
fd196de4f1e9 cleanup. cosmetics only, no functional changes
arpi
parents: 5607
diff changeset
2442 //============================ Auto QUALITY ============================
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2443
1439
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
2444 /*Output quality adjustments:*/
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
2445 if(auto_quality>0){
5610
fd196de4f1e9 cleanup. cosmetics only, no functional changes
arpi
parents: 5607
diff changeset
2446 current_module="autoq";
1496
8c3e93ef116d cleanup...
arpi
parents: 1487
diff changeset
2447 // float total=0.000001f * (GetTimer()-aq_total_time);
1439
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
2448 // if(output_quality<auto_quality && aq_sleep_time>0.05f*total)
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
2449 if(output_quality<auto_quality && aq_sleep_time>0)
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
2450 ++output_quality;
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
2451 else
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
2452 // if(output_quality>0 && aq_sleep_time<-0.05f*total)
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
2453 if(output_quality>1 && aq_sleep_time<0)
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
2454 --output_quality;
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
2455 else
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
2456 if(output_quality>0 && aq_sleep_time<-0.050f) // 50ms
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
2457 output_quality=0;
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
2458 // printf("total: %8.6f sleep: %8.6f q: %d\n",(0.000001f*aq_total_time),aq_sleep_time,output_quality);
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
2459 set_video_quality(sh_video,output_quality);
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
2460 }
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
2461
5610
fd196de4f1e9 cleanup. cosmetics only, no functional changes
arpi
parents: 5607
diff changeset
2462 } // end if(sh_video)
fd196de4f1e9 cleanup. cosmetics only, no functional changes
arpi
parents: 5607
diff changeset
2463
fd196de4f1e9 cleanup. cosmetics only, no functional changes
arpi
parents: 5607
diff changeset
2464 //============================ Handle PAUSE ===============================
fd196de4f1e9 cleanup. cosmetics only, no functional changes
arpi
parents: 5607
diff changeset
2465
fd196de4f1e9 cleanup. cosmetics only, no functional changes
arpi
parents: 5607
diff changeset
2466 current_module="pause";
4587
886bf5274992 Audio only support. Include a fix in the asf demuxer opening.
albeu
parents: 4552
diff changeset
2467
1422
d02e0dcaf077 libvo2 support
arpi
parents: 1421
diff changeset
2468 #ifdef USE_OSD
220
5348fa1313fe OSD functionality improved
arpi_esp
parents: 215
diff changeset
2469 if(osd_visible){
5638
86663f1b9b00 new osd code, use osd objs to follow changes and do minimal updates
arpi
parents: 5627
diff changeset
2470 if (!--osd_visible){
86663f1b9b00 new osd code, use osd objs to follow changes and do minimal updates
arpi
parents: 5627
diff changeset
2471 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
2472 vo_osd_changed(OSDTYPE_PROGBAR);
1504
f4f686aed404 modified mplayer.c to rewert to PLAY after rewinding after 1 sec
atlka
parents: 1501
diff changeset
2473 if (osd_function != OSD_PAUSE)
f4f686aed404 modified mplayer.c to rewert to PLAY after rewinding after 1 sec
atlka
parents: 1501
diff changeset
2474 osd_function = OSD_PLAY;
f4f686aed404 modified mplayer.c to rewert to PLAY after rewinding after 1 sec
atlka
parents: 1501
diff changeset
2475 }
220
5348fa1313fe OSD functionality improved
arpi_esp
parents: 215
diff changeset
2476 }
1422
d02e0dcaf077 libvo2 support
arpi
parents: 1421
diff changeset
2477 #endif
371
55f9067ad176 OSD fixes, patch by Kebert Martin
arpi_esp
parents: 363
diff changeset
2478
55f9067ad176 OSD fixes, patch by Kebert Martin
arpi_esp
parents: 363
diff changeset
2479 if(osd_function==OSD_PAUSE){
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2480 mp_cmd_t* cmd;
4587
886bf5274992 Audio only support. Include a fix in the asf demuxer opening.
albeu
parents: 4552
diff changeset
2481 if(!quiet) {
6930
cae1dd6343e7 moved messages to help_mp-??.h
jaf
parents: 6921
diff changeset
2482 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
2483 fflush(stdout);
886bf5274992 Audio only support. Include a fix in the asf demuxer opening.
albeu
parents: 4552
diff changeset
2484 }
1793
ba11d77c587a gui status maintaining - now pause from console works, and gui display is in sync with osd
arpi
parents: 1792
diff changeset
2485 #ifdef HAVE_NEW_GUI
4974
5da7b1522a9f small bug fixed and workarounds :(
pontscho
parents: 4965
diff changeset
2486 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
2487 #endif
5511
7a24a067f0af vo_config_count now counts calls to vo->config()
arpi
parents: 5507
diff changeset
2488 if (video_out && sh_video && vo_config_count)
4754
ad892563d9c4 Added VOCTRL_PAUSE and VOCTRL_RESUME
mswitch
parents: 4747
diff changeset
2489 video_out->control(VOCTRL_PAUSE, NULL);
ad892563d9c4 Added VOCTRL_PAUSE and VOCTRL_RESUME
mswitch
parents: 4747
diff changeset
2490
1369
7a2f1881b776 a_frame, v_frame killed, using sh_audio/video->timer. has_audio not more used after initialization.
arpi
parents: 1353
diff changeset
2491 if (audio_out && sh_audio)
1156
5dc01778e055 has_audio checkings at reset and exit added
al3x
parents: 1125
diff changeset
2492 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
2493
13603
80fc8f48f14c Do not loose commands while paused.
reimar
parents: 13577
diff changeset
2494 while( (cmd = mp_input_get_cmd(20,1,1)) == NULL) {
5511
7a24a067f0af vo_config_count now counts calls to vo->config()
arpi
parents: 5507
diff changeset
2495 if(sh_video && video_out && vo_config_count) video_out->check_events();
1709
a4e0211455d8 GUI integration, step 1
arpi
parents: 1694
diff changeset
2496 #ifdef HAVE_NEW_GUI
a4e0211455d8 GUI integration, step 1
arpi
parents: 1694
diff changeset
2497 if(use_gui){
4798
c39affa2b376 new interface ? :)
pontscho
parents: 4788
diff changeset
2498 guiEventHandling();
6619
f554e7271587 fix volume handling ( step 2 ) -- add balance support and some code cleanup and fix
pontscho
parents: 6590
diff changeset
2499 guiGetEvent( guiReDraw,NULL );
4963
13262bd21965 small changes
pontscho
parents: 4950
diff changeset
2500 if(guiIntfStruct.Playing!=2 || (rel_seek_secs || abs_seek_pos)) break;
1709
a4e0211455d8 GUI integration, step 1
arpi
parents: 1694
diff changeset
2501 }
a4e0211455d8 GUI integration, step 1
arpi
parents: 1694
diff changeset
2502 #endif
8198
1935017c0f71 Experimantal OSD menu
albeu
parents: 8164
diff changeset
2503 #ifdef HAVE_MENU
1935017c0f71 Experimantal OSD menu
albeu
parents: 8164
diff changeset
2504 if(vf_menu)
1935017c0f71 Experimantal OSD menu
albeu
parents: 8164
diff changeset
2505 vf_menu_pause_update(vf_menu);
1935017c0f71 Experimantal OSD menu
albeu
parents: 8164
diff changeset
2506 #endif
9464
a4e50ab9ac14 3x10l found by Dan Christiansen <danchr@daimi.au.dk>
alex
parents: 9380
diff changeset
2507 usec_sleep(20000);
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2508 }
13768
955ad54a9aab cmd can be NULL when leaving the paused mode and using the GUI
reimar
parents: 13743
diff changeset
2509 if (cmd && cmd->id == MP_CMD_PAUSE) {
13603
80fc8f48f14c Do not loose commands while paused.
reimar
parents: 13577
diff changeset
2510 cmd = mp_input_get_cmd(0,1,0);
5046
b3bd4b29a03b remove obsoleted function (mplResize)
pontscho
parents: 5015
diff changeset
2511 mp_cmd_free(cmd);
13603
80fc8f48f14c Do not loose commands while paused.
reimar
parents: 13577
diff changeset
2512 }
723
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
2513 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
2514 if (audio_out && sh_audio)
1156
5dc01778e055 has_audio checkings at reset and exit added
al3x
parents: 1125
diff changeset
2515 audio_out->resume(); // resume audio
5511
7a24a067f0af vo_config_count now counts calls to vo->config()
arpi
parents: 5507
diff changeset
2516 if (video_out && sh_video && vo_config_count)
4754
ad892563d9c4 Added VOCTRL_PAUSE and VOCTRL_RESUME
mswitch
parents: 4747
diff changeset
2517 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
2518 (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
2519 #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
2520 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
2521 {
a4bbda72ce86 fix two small bug and add multimedia keyboard support ( i tested with Acer AirKey V only )
pontscho
parents: 6173
diff changeset
2522 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
2523 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
2524 }
1793
ba11d77c587a gui status maintaining - now pause from console works, and gui display is in sync with osd
arpi
parents: 1792
diff changeset
2525 #endif
371
55f9067ad176 OSD fixes, patch by Kebert Martin
arpi_esp
parents: 363
diff changeset
2526 }
55f9067ad176 OSD fixes, patch by Kebert Martin
arpi_esp
parents: 363
diff changeset
2527
5610
fd196de4f1e9 cleanup. cosmetics only, no functional changes
arpi
parents: 5607
diff changeset
2528 // handle -sstep
2436
18c12656c816 -sstep patch by Aleksander V. Dyomin <fly@shax.ru>
arpi
parents: 2365
diff changeset
2529 if(step_sec>0) {
18c12656c816 -sstep patch by Aleksander V. Dyomin <fly@shax.ru>
arpi
parents: 2365
diff changeset
2530 osd_function=OSD_FFW;
18c12656c816 -sstep patch by Aleksander V. Dyomin <fly@shax.ru>
arpi
parents: 2365
diff changeset
2531 rel_seek_secs+=step_sec;
18c12656c816 -sstep patch by Aleksander V. Dyomin <fly@shax.ru>
arpi
parents: 2365
diff changeset
2532 }
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2533
5489
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
2534 #ifdef USE_DVDNAV
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
2535 if (stream->type==STREAMTYPE_DVDNAV && dvd_nav_still)
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
2536 dvdnav_stream_sleeping((dvdnav_priv_t*)stream->priv);
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
2537 #endif
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
2538
8531
1aa2c9b460af Merged EDL 0.5 patch - it's something like Quicktime's edit lists.
arpi
parents: 8494
diff changeset
2539 //================= EDL =========================================
1aa2c9b460af Merged EDL 0.5 patch - it's something like Quicktime's edit lists.
arpi
parents: 8494
diff changeset
2540
1aa2c9b460af Merged EDL 0.5 patch - it's something like Quicktime's edit lists.
arpi
parents: 8494
diff changeset
2541 #ifdef USE_EDL
13168
ce046ef860da EDL enhancement/fixes:
rtognimp
parents: 13132
diff changeset
2542 if( next_edl_record ) { // Are we (still?) doing EDL?
12207
3c148bdd86d9 Fix segfault if EDL is used without video
rtognimp
parents: 12145
diff changeset
2543 if ( !sh_video ) {
13358
567875b88aab Hardcoded EDL messages moved to help_mp-en.h, Doxygen comments added, patch
diego
parents: 13353
diff changeset
2544 mp_msg( MSGT_CPLAYER, MSGL_ERR, MSGTR_EdlNOsh_video );
12207
3c148bdd86d9 Fix segfault if EDL is used without video
rtognimp
parents: 12145
diff changeset
2545 next_edl_record->next = NULL;
3c148bdd86d9 Fix segfault if EDL is used without video
rtognimp
parents: 12145
diff changeset
2546 } else {
8966
arpi
parents: 8965
diff changeset
2547 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
2548 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
2549 osd_function = OSD_FFW;
1aa2c9b460af Merged EDL 0.5 patch - it's something like Quicktime's edit lists.
arpi
parents: 8494
diff changeset
2550 abs_seek_pos = 0;
1aa2c9b460af Merged EDL 0.5 patch - it's something like Quicktime's edit lists.
arpi
parents: 8494
diff changeset
2551 rel_seek_secs = next_edl_record->length_sec;
13773
60c66b5aa2e1 Fixed 2 debug edl messages
reynaldo
parents: 13768
diff changeset
2552 mp_msg(MSGT_CPLAYER, MSGL_DBG4, "EDL_SKIP: start [%f], stop [%f], length [%f]\n", next_edl_record->start_sec, next_edl_record->stop_sec, next_edl_record->length_sec );
8531
1aa2c9b460af Merged EDL 0.5 patch - it's something like Quicktime's edit lists.
arpi
parents: 8494
diff changeset
2553 edl_decision = 1;
1aa2c9b460af Merged EDL 0.5 patch - it's something like Quicktime's edit lists.
arpi
parents: 8494
diff changeset
2554 } 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
2555 mixer_mute(&mixer);
13358
567875b88aab Hardcoded EDL messages moved to help_mp-en.h, Doxygen comments added, patch
diego
parents: 13353
diff changeset
2556 edl_mute_count++; // new EDL seek behavior needs this
13773
60c66b5aa2e1 Fixed 2 debug edl messages
reynaldo
parents: 13768
diff changeset
2557 mp_msg(MSGT_CPLAYER, MSGL_DBG4, "EDL_MUTE: [%f]\n", next_edl_record->start_sec );
8531
1aa2c9b460af Merged EDL 0.5 patch - it's something like Quicktime's edit lists.
arpi
parents: 8494
diff changeset
2558 edl_decision = 1;
1aa2c9b460af Merged EDL 0.5 patch - it's something like Quicktime's edit lists.
arpi
parents: 8494
diff changeset
2559 }
13168
ce046ef860da EDL enhancement/fixes:
rtognimp
parents: 13132
diff changeset
2560 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
2561 }
12207
3c148bdd86d9 Fix segfault if EDL is used without video
rtognimp
parents: 12145
diff changeset
2562 }
8531
1aa2c9b460af Merged EDL 0.5 patch - it's something like Quicktime's edit lists.
arpi
parents: 8494
diff changeset
2563 }
1aa2c9b460af Merged EDL 0.5 patch - it's something like Quicktime's edit lists.
arpi
parents: 8494
diff changeset
2564 #endif
1aa2c9b460af Merged EDL 0.5 patch - it's something like Quicktime's edit lists.
arpi
parents: 8494
diff changeset
2565
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2566 //================= Keyboard events, SEEKing ====================
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2567
5610
fd196de4f1e9 cleanup. cosmetics only, no functional changes
arpi
parents: 5607
diff changeset
2568 current_module="key_events";
fd196de4f1e9 cleanup. cosmetics only, no functional changes
arpi
parents: 5607
diff changeset
2569
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2570 {
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2571 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
2572 int brk_cmd = 0;
13603
80fc8f48f14c Do not loose commands while paused.
reimar
parents: 13577
diff changeset
2573 while( !brk_cmd && (cmd = mp_input_get_cmd(0,0,0)) != NULL) {
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2574 switch(cmd->id) {
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2575 case MP_CMD_SEEK : {
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2576 int v,abs;
8612
a61d1b326beb It shows not just the progressbar, but progressbar /and/ percentage
arpi
parents: 8606
diff changeset
2577 osd_show_percentage = 25;
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2578 v = cmd->args[0].v.i;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2579 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
2580 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
2581 abs_seek_pos = 1;
9720e88cd0bc This tiny patch adds "type=2" absolute seconds seek capability.
arpi
parents: 7419
diff changeset
2582 if(sh_video)
9720e88cd0bc This tiny patch adds "type=2" absolute seconds seek capability.
arpi
parents: 7419
diff changeset
2583 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
2584 rel_seek_secs = v;
9720e88cd0bc This tiny patch adds "type=2" absolute seconds seek capability.
arpi
parents: 7419
diff changeset
2585 }
9720e88cd0bc This tiny patch adds "type=2" absolute seconds seek capability.
arpi
parents: 7419
diff changeset
2586 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
2587 abs_seek_pos = 3;
5798
pontscho
parents: 5797
diff changeset
2588 if(sh_video)
pontscho
parents: 5797
diff changeset
2589 osd_function= (v > sh_video->timer) ? OSD_FFW : OSD_REW;
pontscho
parents: 5797
diff changeset
2590 rel_seek_secs = v/100.0;
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2591 }
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2592 else {
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2593 rel_seek_secs+= v;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2594 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
2595 }
10409
4c9ca4819bed Commands are read in a loop, but for some commands we need to break
albeu
parents: 10397
diff changeset
2596 brk_cmd = 1;
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2597 } break;
8531
1aa2c9b460af Merged EDL 0.5 patch - it's something like Quicktime's edit lists.
arpi
parents: 8494
diff changeset
2598 #ifdef USE_EDL
1aa2c9b460af Merged EDL 0.5 patch - it's something like Quicktime's edit lists.
arpi
parents: 8494
diff changeset
2599 case MP_CMD_EDL_MARK:
1aa2c9b460af Merged EDL 0.5 patch - it's something like Quicktime's edit lists.
arpi
parents: 8494
diff changeset
2600 if( edl_fd ) {
8966
arpi
parents: 8965
diff changeset
2601 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
2602 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
2603 }
1aa2c9b460af Merged EDL 0.5 patch - it's something like Quicktime's edit lists.
arpi
parents: 8494
diff changeset
2604 break;
1aa2c9b460af Merged EDL 0.5 patch - it's something like Quicktime's edit lists.
arpi
parents: 8494
diff changeset
2605 #endif
13339
1c787349d286 slave mode command to switch aspect ratio, patch by Aurelien Jacobs <aurel at gnuage.org>
faust3
parents: 13338
diff changeset
2606 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
2607 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
2608 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
2609 else
1c787349d286 slave mode command to switch aspect ratio, patch by Aurelien Jacobs <aurel at gnuage.org>
faust3
parents: 13338
diff changeset
2610 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
2611 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
2612 } break;
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2613 case MP_CMD_AUDIO_DELAY : {
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2614 float v = cmd->args[0].v.f;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2615 audio_delay += v;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2616 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
2617 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
2618 } break;
13710
d7af73cc38da allow changing playback speed during playback.
reimar
parents: 13684
diff changeset
2619 case MP_CMD_SPEED_INCR : {
d7af73cc38da allow changing playback speed during playback.
reimar
parents: 13684
diff changeset
2620 float v = cmd->args[0].v.f;
d7af73cc38da allow changing playback speed during playback.
reimar
parents: 13684
diff changeset
2621 playback_speed += v;
13743
5a999bdc0534 100l for playback speed changing in audio-only case
reimar
parents: 13742
diff changeset
2622 if (sh_video)
13710
d7af73cc38da allow changing playback speed during playback.
reimar
parents: 13684
diff changeset
2623 osd_show_speed = sh_video->fps;
d7af73cc38da allow changing playback speed during playback.
reimar
parents: 13684
diff changeset
2624 build_afilter_chain(sh_audio, &ao_data);
d7af73cc38da allow changing playback speed during playback.
reimar
parents: 13684
diff changeset
2625 } break;
d7af73cc38da allow changing playback speed during playback.
reimar
parents: 13684
diff changeset
2626 case MP_CMD_SPEED_MULT : {
d7af73cc38da allow changing playback speed during playback.
reimar
parents: 13684
diff changeset
2627 float v = cmd->args[0].v.f;
d7af73cc38da allow changing playback speed during playback.
reimar
parents: 13684
diff changeset
2628 playback_speed *= v;
13743
5a999bdc0534 100l for playback speed changing in audio-only case
reimar
parents: 13742
diff changeset
2629 if (sh_video)
13710
d7af73cc38da allow changing playback speed during playback.
reimar
parents: 13684
diff changeset
2630 osd_show_speed = sh_video->fps;
d7af73cc38da allow changing playback speed during playback.
reimar
parents: 13684
diff changeset
2631 build_afilter_chain(sh_audio, &ao_data);
d7af73cc38da allow changing playback speed during playback.
reimar
parents: 13684
diff changeset
2632 } break;
d7af73cc38da allow changing playback speed during playback.
reimar
parents: 13684
diff changeset
2633 case MP_CMD_SPEED_SET : {
d7af73cc38da allow changing playback speed during playback.
reimar
parents: 13684
diff changeset
2634 float v = cmd->args[0].v.f;
d7af73cc38da allow changing playback speed during playback.
reimar
parents: 13684
diff changeset
2635 playback_speed = v;
13743
5a999bdc0534 100l for playback speed changing in audio-only case
reimar
parents: 13742
diff changeset
2636 if (sh_video)
13710
d7af73cc38da allow changing playback speed during playback.
reimar
parents: 13684
diff changeset
2637 osd_show_speed = sh_video->fps;
d7af73cc38da allow changing playback speed during playback.
reimar
parents: 13684
diff changeset
2638 build_afilter_chain(sh_audio, &ao_data);
d7af73cc38da allow changing playback speed during playback.
reimar
parents: 13684
diff changeset
2639 } break;
13626
741649fe31cb allow to step only one frame forward by pressing s.
reimar
parents: 13603
diff changeset
2640 case MP_CMD_FRAME_STEP :
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2641 case MP_CMD_PAUSE : {
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2642 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
2643 brk_cmd = 1;
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2644 } break;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2645 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
2646 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
2647 }
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2648 case MP_CMD_GRAB_FRAMES : {
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2649 grab_frames=2;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2650 } break;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2651 case MP_CMD_PLAY_TREE_STEP : {
8198
1935017c0f71 Experimantal OSD menu
albeu
parents: 8164
diff changeset
2652 int n = cmd->args[0].v.i == 0 ? 1 : cmd->args[0].v.i;
5135
aeef7f3c2096 Now enter key quit if no next file is avaible
albeu
parents: 5129
diff changeset
2653 int force = cmd->args[1].v.i;
aeef7f3c2096 Now enter key quit if no next file is avaible
albeu
parents: 5129
diff changeset
2654
9291
64b8c5a07c2c - It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents: 9217
diff changeset
2655 #ifdef HAVE_NEW_GUI
64b8c5a07c2c - It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents: 9217
diff changeset
2656 if (use_gui) {
64b8c5a07c2c - It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents: 9217
diff changeset
2657 int i=0;
64b8c5a07c2c - It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents: 9217
diff changeset
2658 if (n>0)
64b8c5a07c2c - It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents: 9217
diff changeset
2659 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
2660 mplNext();
64b8c5a07c2c - It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents: 9217
diff changeset
2661 else
64b8c5a07c2c - It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents: 9217
diff changeset
2662 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
2663 mplPrev();
64b8c5a07c2c - It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents: 9217
diff changeset
2664 } else
64b8c5a07c2c - It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents: 9217
diff changeset
2665 #endif
64b8c5a07c2c - It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents: 9217
diff changeset
2666 {
64b8c5a07c2c - It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents: 9217
diff changeset
2667 if(!force && playtree_iter) {
5135
aeef7f3c2096 Now enter key quit if no next file is avaible
albeu
parents: 5129
diff changeset
2668 play_tree_iter_t* i = play_tree_iter_new_copy(playtree_iter);
aeef7f3c2096 Now enter key quit if no next file is avaible
albeu
parents: 5129
diff changeset
2669
aeef7f3c2096 Now enter key quit if no next file is avaible
albeu
parents: 5129
diff changeset
2670 if(play_tree_iter_step(i,n,0) == PLAY_TREE_ITER_ENTRY)
aeef7f3c2096 Now enter key quit if no next file is avaible
albeu
parents: 5129
diff changeset
2671 eof = (n > 0) ? PT_NEXT_ENTRY : PT_PREV_ENTRY;
aeef7f3c2096 Now enter key quit if no next file is avaible
albeu
parents: 5129
diff changeset
2672 play_tree_iter_free(i);
aeef7f3c2096 Now enter key quit if no next file is avaible
albeu
parents: 5129
diff changeset
2673 } else
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2674 eof = (n > 0) ? PT_NEXT_ENTRY : PT_PREV_ENTRY;
8198
1935017c0f71 Experimantal OSD menu
albeu
parents: 8164
diff changeset
2675 if(eof)
1935017c0f71 Experimantal OSD menu
albeu
parents: 8164
diff changeset
2676 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
2677 brk_cmd = 1;
9291
64b8c5a07c2c - It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents: 9217
diff changeset
2678 }
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2679 } break;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2680 case MP_CMD_PLAY_TREE_UP_STEP : {
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2681 int n = cmd->args[0].v.i > 0 ? 1 : -1;
5135
aeef7f3c2096 Now enter key quit if no next file is avaible
albeu
parents: 5129
diff changeset
2682 int force = cmd->args[1].v.i;
aeef7f3c2096 Now enter key quit if no next file is avaible
albeu
parents: 5129
diff changeset
2683
9291
64b8c5a07c2c - It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents: 9217
diff changeset
2684 if(!force && playtree_iter) {
5135
aeef7f3c2096 Now enter key quit if no next file is avaible
albeu
parents: 5129
diff changeset
2685 play_tree_iter_t* i = play_tree_iter_new_copy(playtree_iter);
aeef7f3c2096 Now enter key quit if no next file is avaible
albeu
parents: 5129
diff changeset
2686 if(play_tree_iter_up_step(i,n,0) == PLAY_TREE_ITER_ENTRY)
aeef7f3c2096 Now enter key quit if no next file is avaible
albeu
parents: 5129
diff changeset
2687 eof = (n > 0) ? PT_UP_NEXT : PT_UP_PREV;
aeef7f3c2096 Now enter key quit if no next file is avaible
albeu
parents: 5129
diff changeset
2688 play_tree_iter_free(i);
aeef7f3c2096 Now enter key quit if no next file is avaible
albeu
parents: 5129
diff changeset
2689 } else
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2690 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
2691 brk_cmd = 1;
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2692 } break;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2693 case MP_CMD_PLAY_ALT_SRC_STEP : {
9352
pontscho
parents: 9346
diff changeset
2694 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
2695 int v = cmd->args[0].v.i;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2696 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
2697 eof = PT_NEXT_SRC;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2698 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
2699 eof = PT_PREV_SRC;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2700 }
10409
4c9ca4819bed Commands are read in a loop, but for some commands we need to break
albeu
parents: 10397
diff changeset
2701 brk_cmd = 1;
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2702 } break;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2703 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
2704 #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
2705 if (sh_video) {
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2706 int abs= cmd->args[1].v.i;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2707 float v = cmd->args[0].v.f;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2708 if(abs)
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2709 sub_delay = v;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2710 else
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2711 sub_delay += v;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2712 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
2713 }
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
2714 #endif
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2715 } break;
8365
423a19edc0a4 This patch makes it possible to navigate among the subtitles while
arpi
parents: 8364
diff changeset
2716 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
2717 #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
2718 if (sh_video) {
8365
423a19edc0a4 This patch makes it possible to navigate among the subtitles while
arpi
parents: 8364
diff changeset
2719 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
2720 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
2721 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
2722 }
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
2723 #endif
8365
423a19edc0a4 This patch makes it possible to navigate among the subtitles while
arpi
parents: 8364
diff changeset
2724 } 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
2725 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
2726 #ifdef USE_OSD
4587
886bf5274992 Audio only support. Include a fix in the asf demuxer opening.
albeu
parents: 4552
diff changeset
2727 if(sh_video) {
886bf5274992 Audio only support. Include a fix in the asf demuxer opening.
albeu
parents: 4552
diff changeset
2728 int v = cmd->args[0].v.i;
886bf5274992 Audio only support. Include a fix in the asf demuxer opening.
albeu
parents: 4552
diff changeset
2729 if(v < 0)
8612
a61d1b326beb It shows not just the progressbar, but progressbar /and/ percentage
arpi
parents: 8606
diff changeset
2730 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
2731 else
8612
a61d1b326beb It shows not just the progressbar, but progressbar /and/ percentage
arpi
parents: 8606
diff changeset
2732 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
2733 }
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
2734 #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
2735 } 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
2736 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
2737 #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
2738 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
2739 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
2740 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
2741 }
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
2742 #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
2743 } break;
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2744 case MP_CMD_VOLUME : {
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2745 int v = cmd->args[0].v.i;
7055
5a6616a088f2 new slave volume command done :
arpi
parents: 7019
diff changeset
2746
5a6616a088f2 new slave volume command done :
arpi
parents: 7019
diff changeset
2747 // start change for absolute volume value
5a6616a088f2 new slave volume command done :
arpi
parents: 7019
diff changeset
2748 int abs = (cmd->nargs > 1) ? cmd->args[1].v.i : 0;
5a6616a088f2 new slave volume command done :
arpi
parents: 7019
diff changeset
2749
5a6616a088f2 new slave volume command done :
arpi
parents: 7019
diff changeset
2750 if( abs )
5a6616a088f2 new slave volume command done :
arpi
parents: 7019
diff changeset
2751 {
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
2752 mixer_setvolume(&mixer, (float)v, (float)v );
7055
5a6616a088f2 new slave volume command done :
arpi
parents: 7019
diff changeset
2753 } else {
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2754 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
2755 mixer_incvolume(&mixer);
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2756 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
2757 mixer_decvolume(&mixer);
7055
5a6616a088f2 new slave volume command done :
arpi
parents: 7019
diff changeset
2758 }
5a6616a088f2 new slave volume command done :
arpi
parents: 7019
diff changeset
2759
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2760 #ifdef USE_OSD
7923
bad21f499a9e avoids segfaults w.r.t to mp3 files handling:
pl
parents: 7906
diff changeset
2761 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
2762 float vol;
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2763 osd_visible=sh_video->fps; // 1 sec
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2764 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
2765 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
2766 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
2767 vo_osd_changed(OSDTYPE_PROGBAR);
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2768 }
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2769 #endif
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2770 } break;
6940
335d827e8201 10l bug (missing break;) found by Jim Hawkins <jim@jawkins.com>
arpi
parents: 6930
diff changeset
2771 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
2772 mixer_mute(&mixer);
6940
335d827e8201 10l bug (missing break;) found by Jim Hawkins <jim@jawkins.com>
arpi
parents: 6930
diff changeset
2773 break;
6818
b9a6817d9ff3 Add loadfile and loadlist commands. May be buggy if the filename contain some
albeu
parents: 6796
diff changeset
2774 case MP_CMD_LOADFILE : {
b9a6817d9ff3 Add loadfile and loadlist commands. May be buggy if the filename contain some
albeu
parents: 6796
diff changeset
2775 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
2776 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
2777
b9a6817d9ff3 Add loadfile and loadlist commands. May be buggy if the filename contain some
albeu
parents: 6796
diff changeset
2778 // 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
2779 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
2780 /* NOP */;
b9a6817d9ff3 Add loadfile and loadlist commands. May be buggy if the filename contain some
albeu
parents: 6796
diff changeset
2781 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
2782 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
2783 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
2784 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
2785 brk_cmd = 1;
6818
b9a6817d9ff3 Add loadfile and loadlist commands. May be buggy if the filename contain some
albeu
parents: 6796
diff changeset
2786 } break;
b9a6817d9ff3 Add loadfile and loadlist commands. May be buggy if the filename contain some
albeu
parents: 6796
diff changeset
2787 case MP_CMD_LOADLIST : {
b9a6817d9ff3 Add loadfile and loadlist commands. May be buggy if the filename contain some
albeu
parents: 6796
diff changeset
2788 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
2789 if(!e)
6930
cae1dd6343e7 moved messages to help_mp-??.h
jaf
parents: 6921
diff changeset
2790 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
2791 else {
b9a6817d9ff3 Add loadfile and loadlist commands. May be buggy if the filename contain some
albeu
parents: 6796
diff changeset
2792 // 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
2793 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
2794 /* NOP */;
b9a6817d9ff3 Add loadfile and loadlist commands. May be buggy if the filename contain some
albeu
parents: 6796
diff changeset
2795 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
2796 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
2797 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
2798 eof = PT_NEXT_SRC;
b9a6817d9ff3 Add loadfile and loadlist commands. May be buggy if the filename contain some
albeu
parents: 6796
diff changeset
2799 }
10409
4c9ca4819bed Commands are read in a loop, but for some commands we need to break
albeu
parents: 10397
diff changeset
2800 brk_cmd = 1;
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2801 } break;
7517
9d433771b6d0 -vf eq2, LUT-based brightness/contrast/gamma correction (Y-only)
arpi
parents: 7516
diff changeset
2802 case MP_CMD_GAMMA : {
9d433771b6d0 -vf eq2, LUT-based brightness/contrast/gamma correction (Y-only)
arpi
parents: 7516
diff changeset
2803 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
2804
9d433771b6d0 -vf eq2, LUT-based brightness/contrast/gamma correction (Y-only)
arpi
parents: 7516
diff changeset
2805 if (!sh_video)
9d433771b6d0 -vf eq2, LUT-based brightness/contrast/gamma correction (Y-only)
arpi
parents: 7516
diff changeset
2806 break;
9d433771b6d0 -vf eq2, LUT-based brightness/contrast/gamma correction (Y-only)
arpi
parents: 7516
diff changeset
2807
9d433771b6d0 -vf eq2, LUT-based brightness/contrast/gamma correction (Y-only)
arpi
parents: 7516
diff changeset
2808 if (vo_gamma_gamma == 1000)
9d433771b6d0 -vf eq2, LUT-based brightness/contrast/gamma correction (Y-only)
arpi
parents: 7516
diff changeset
2809 {
9d433771b6d0 -vf eq2, LUT-based brightness/contrast/gamma correction (Y-only)
arpi
parents: 7516
diff changeset
2810 vo_gamma_gamma = 0;
9d433771b6d0 -vf eq2, LUT-based brightness/contrast/gamma correction (Y-only)
arpi
parents: 7516
diff changeset
2811 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
2812 }
9d433771b6d0 -vf eq2, LUT-based brightness/contrast/gamma correction (Y-only)
arpi
parents: 7516
diff changeset
2813
9d433771b6d0 -vf eq2, LUT-based brightness/contrast/gamma correction (Y-only)
arpi
parents: 7516
diff changeset
2814 if (abs)
9d433771b6d0 -vf eq2, LUT-based brightness/contrast/gamma correction (Y-only)
arpi
parents: 7516
diff changeset
2815 vo_gamma_gamma = v;
9d433771b6d0 -vf eq2, LUT-based brightness/contrast/gamma correction (Y-only)
arpi
parents: 7516
diff changeset
2816 else
9d433771b6d0 -vf eq2, LUT-based brightness/contrast/gamma correction (Y-only)
arpi
parents: 7516
diff changeset
2817 vo_gamma_gamma += v;
9d433771b6d0 -vf eq2, LUT-based brightness/contrast/gamma correction (Y-only)
arpi
parents: 7516
diff changeset
2818
9d433771b6d0 -vf eq2, LUT-based brightness/contrast/gamma correction (Y-only)
arpi
parents: 7516
diff changeset
2819 if (vo_gamma_gamma > 100)
9d433771b6d0 -vf eq2, LUT-based brightness/contrast/gamma correction (Y-only)
arpi
parents: 7516
diff changeset
2820 vo_gamma_gamma = 100;
9d433771b6d0 -vf eq2, LUT-based brightness/contrast/gamma correction (Y-only)
arpi
parents: 7516
diff changeset
2821 else if (vo_gamma_gamma < -100)
9d433771b6d0 -vf eq2, LUT-based brightness/contrast/gamma correction (Y-only)
arpi
parents: 7516
diff changeset
2822 vo_gamma_gamma = -100;
9d433771b6d0 -vf eq2, LUT-based brightness/contrast/gamma correction (Y-only)
arpi
parents: 7516
diff changeset
2823 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
2824 #ifdef USE_OSD
9d433771b6d0 -vf eq2, LUT-based brightness/contrast/gamma correction (Y-only)
arpi
parents: 7516
diff changeset
2825 if(osd_level){
9d433771b6d0 -vf eq2, LUT-based brightness/contrast/gamma correction (Y-only)
arpi
parents: 7516
diff changeset
2826 osd_visible=sh_video->fps; // 1 sec
9d433771b6d0 -vf eq2, LUT-based brightness/contrast/gamma correction (Y-only)
arpi
parents: 7516
diff changeset
2827 vo_osd_progbar_type=OSD_BRIGHTNESS;
9d433771b6d0 -vf eq2, LUT-based brightness/contrast/gamma correction (Y-only)
arpi
parents: 7516
diff changeset
2828 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
2829 vo_osd_changed(OSDTYPE_PROGBAR);
9d433771b6d0 -vf eq2, LUT-based brightness/contrast/gamma correction (Y-only)
arpi
parents: 7516
diff changeset
2830 }
9d433771b6d0 -vf eq2, LUT-based brightness/contrast/gamma correction (Y-only)
arpi
parents: 7516
diff changeset
2831 #endif // USE_OSD
9d433771b6d0 -vf eq2, LUT-based brightness/contrast/gamma correction (Y-only)
arpi
parents: 7516
diff changeset
2832 } break;
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2833 case MP_CMD_BRIGHTNESS : {
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2834 int v = cmd->args[0].v.i, abs = cmd->args[1].v.i;
6786
b16cb6cbff5a eq reworked
alex
parents: 6784
diff changeset
2835
b16cb6cbff5a eq reworked
alex
parents: 6784
diff changeset
2836 if (!sh_video)
b16cb6cbff5a eq reworked
alex
parents: 6784
diff changeset
2837 break;
b16cb6cbff5a eq reworked
alex
parents: 6784
diff changeset
2838
b16cb6cbff5a eq reworked
alex
parents: 6784
diff changeset
2839 if (vo_gamma_brightness == 1000)
b16cb6cbff5a eq reworked
alex
parents: 6784
diff changeset
2840 {
b16cb6cbff5a eq reworked
alex
parents: 6784
diff changeset
2841 vo_gamma_brightness = 0;
b16cb6cbff5a eq reworked
alex
parents: 6784
diff changeset
2842 get_video_colors(sh_video, "brightness", &vo_gamma_brightness);
b16cb6cbff5a eq reworked
alex
parents: 6784
diff changeset
2843 }
b16cb6cbff5a eq reworked
alex
parents: 6784
diff changeset
2844
6781
924263b4df10 eq reworked
alex
parents: 6755
diff changeset
2845 if (abs)
924263b4df10 eq reworked
alex
parents: 6755
diff changeset
2846 vo_gamma_brightness = v;
924263b4df10 eq reworked
alex
parents: 6755
diff changeset
2847 else
924263b4df10 eq reworked
alex
parents: 6755
diff changeset
2848 vo_gamma_brightness += v;
924263b4df10 eq reworked
alex
parents: 6755
diff changeset
2849
924263b4df10 eq reworked
alex
parents: 6755
diff changeset
2850 if (vo_gamma_brightness > 100)
924263b4df10 eq reworked
alex
parents: 6755
diff changeset
2851 vo_gamma_brightness = 100;
924263b4df10 eq reworked
alex
parents: 6755
diff changeset
2852 else if (vo_gamma_brightness < -100)
924263b4df10 eq reworked
alex
parents: 6755
diff changeset
2853 vo_gamma_brightness = -100;
924263b4df10 eq reworked
alex
parents: 6755
diff changeset
2854 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
2855 #ifdef USE_OSD
6755
a31b9f15cbff - fix audio equalizer
pontscho
parents: 6713
diff changeset
2856 if(osd_level){
a31b9f15cbff - fix audio equalizer
pontscho
parents: 6713
diff changeset
2857 osd_visible=sh_video->fps; // 1 sec
a31b9f15cbff - fix audio equalizer
pontscho
parents: 6713
diff changeset
2858 vo_osd_progbar_type=OSD_BRIGHTNESS;
a31b9f15cbff - fix audio equalizer
pontscho
parents: 6713
diff changeset
2859 vo_osd_progbar_value=(vo_gamma_brightness<<7)/100 + 128;
a31b9f15cbff - fix audio equalizer
pontscho
parents: 6713
diff changeset
2860 vo_osd_changed(OSDTYPE_PROGBAR);
a31b9f15cbff - fix audio equalizer
pontscho
parents: 6713
diff changeset
2861 }
a31b9f15cbff - fix audio equalizer
pontscho
parents: 6713
diff changeset
2862 #endif // USE_OSD
a31b9f15cbff - fix audio equalizer
pontscho
parents: 6713
diff changeset
2863 }
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2864 } break;
6781
924263b4df10 eq reworked
alex
parents: 6755
diff changeset
2865 case MP_CMD_CONTRAST : {
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2866 int v = cmd->args[0].v.i, abs = cmd->args[1].v.i;
6786
b16cb6cbff5a eq reworked
alex
parents: 6784
diff changeset
2867
b16cb6cbff5a eq reworked
alex
parents: 6784
diff changeset
2868 if (!sh_video)
b16cb6cbff5a eq reworked
alex
parents: 6784
diff changeset
2869 break;
b16cb6cbff5a eq reworked
alex
parents: 6784
diff changeset
2870
b16cb6cbff5a eq reworked
alex
parents: 6784
diff changeset
2871 if (vo_gamma_contrast == 1000)
b16cb6cbff5a eq reworked
alex
parents: 6784
diff changeset
2872 {
b16cb6cbff5a eq reworked
alex
parents: 6784
diff changeset
2873 vo_gamma_contrast = 0;
b16cb6cbff5a eq reworked
alex
parents: 6784
diff changeset
2874 get_video_colors(sh_video, "contrast", &vo_gamma_contrast);
b16cb6cbff5a eq reworked
alex
parents: 6784
diff changeset
2875 }
6781
924263b4df10 eq reworked
alex
parents: 6755
diff changeset
2876
924263b4df10 eq reworked
alex
parents: 6755
diff changeset
2877 if (abs)
924263b4df10 eq reworked
alex
parents: 6755
diff changeset
2878 vo_gamma_contrast = v;
924263b4df10 eq reworked
alex
parents: 6755
diff changeset
2879 else
924263b4df10 eq reworked
alex
parents: 6755
diff changeset
2880 vo_gamma_contrast += v;
924263b4df10 eq reworked
alex
parents: 6755
diff changeset
2881
924263b4df10 eq reworked
alex
parents: 6755
diff changeset
2882 if (vo_gamma_contrast > 100)
924263b4df10 eq reworked
alex
parents: 6755
diff changeset
2883 vo_gamma_contrast = 100;
924263b4df10 eq reworked
alex
parents: 6755
diff changeset
2884 else if (vo_gamma_contrast < -100)
924263b4df10 eq reworked
alex
parents: 6755
diff changeset
2885 vo_gamma_contrast = -100;
924263b4df10 eq reworked
alex
parents: 6755
diff changeset
2886 if(set_video_colors(sh_video, "contrast", vo_gamma_contrast)){
924263b4df10 eq reworked
alex
parents: 6755
diff changeset
2887 #ifdef USE_OSD
924263b4df10 eq reworked
alex
parents: 6755
diff changeset
2888 if(osd_level){
924263b4df10 eq reworked
alex
parents: 6755
diff changeset
2889 osd_visible=sh_video->fps; // 1 sec
924263b4df10 eq reworked
alex
parents: 6755
diff changeset
2890 vo_osd_progbar_type=OSD_CONTRAST;
924263b4df10 eq reworked
alex
parents: 6755
diff changeset
2891 vo_osd_progbar_value=(vo_gamma_contrast<<7)/100 + 128;
924263b4df10 eq reworked
alex
parents: 6755
diff changeset
2892 vo_osd_changed(OSDTYPE_PROGBAR);
924263b4df10 eq reworked
alex
parents: 6755
diff changeset
2893 }
924263b4df10 eq reworked
alex
parents: 6755
diff changeset
2894 #endif // USE_OSD
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2895 }
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2896 } break;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2897 case MP_CMD_SATURATION : {
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2898 int v = cmd->args[0].v.i, abs = cmd->args[1].v.i;
6786
b16cb6cbff5a eq reworked
alex
parents: 6784
diff changeset
2899
b16cb6cbff5a eq reworked
alex
parents: 6784
diff changeset
2900 if (!sh_video)
b16cb6cbff5a eq reworked
alex
parents: 6784
diff changeset
2901 break;
b16cb6cbff5a eq reworked
alex
parents: 6784
diff changeset
2902
b16cb6cbff5a eq reworked
alex
parents: 6784
diff changeset
2903 if (vo_gamma_saturation == 1000)
b16cb6cbff5a eq reworked
alex
parents: 6784
diff changeset
2904 {
b16cb6cbff5a eq reworked
alex
parents: 6784
diff changeset
2905 vo_gamma_saturation = 0;
b16cb6cbff5a eq reworked
alex
parents: 6784
diff changeset
2906 get_video_colors(sh_video, "saturation", &vo_gamma_saturation);
b16cb6cbff5a eq reworked
alex
parents: 6784
diff changeset
2907 }
b16cb6cbff5a eq reworked
alex
parents: 6784
diff changeset
2908
6781
924263b4df10 eq reworked
alex
parents: 6755
diff changeset
2909 if (abs)
924263b4df10 eq reworked
alex
parents: 6755
diff changeset
2910 vo_gamma_saturation = v;
924263b4df10 eq reworked
alex
parents: 6755
diff changeset
2911 else
924263b4df10 eq reworked
alex
parents: 6755
diff changeset
2912 vo_gamma_saturation += v;
924263b4df10 eq reworked
alex
parents: 6755
diff changeset
2913
924263b4df10 eq reworked
alex
parents: 6755
diff changeset
2914 if (vo_gamma_saturation > 100)
924263b4df10 eq reworked
alex
parents: 6755
diff changeset
2915 vo_gamma_saturation = 100;
924263b4df10 eq reworked
alex
parents: 6755
diff changeset
2916 else if (vo_gamma_saturation < -100)
924263b4df10 eq reworked
alex
parents: 6755
diff changeset
2917 vo_gamma_saturation = -100;
924263b4df10 eq reworked
alex
parents: 6755
diff changeset
2918 if(set_video_colors(sh_video, "saturation", vo_gamma_saturation)){
924263b4df10 eq reworked
alex
parents: 6755
diff changeset
2919 #ifdef USE_OSD
924263b4df10 eq reworked
alex
parents: 6755
diff changeset
2920 if(osd_level){
924263b4df10 eq reworked
alex
parents: 6755
diff changeset
2921 osd_visible=sh_video->fps; // 1 sec
924263b4df10 eq reworked
alex
parents: 6755
diff changeset
2922 vo_osd_progbar_type=OSD_SATURATION;
924263b4df10 eq reworked
alex
parents: 6755
diff changeset
2923 vo_osd_progbar_value=(vo_gamma_saturation<<7)/100 + 128;
924263b4df10 eq reworked
alex
parents: 6755
diff changeset
2924 vo_osd_changed(OSDTYPE_PROGBAR);
924263b4df10 eq reworked
alex
parents: 6755
diff changeset
2925 }
924263b4df10 eq reworked
alex
parents: 6755
diff changeset
2926 #endif // USE_OSD
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2927 }
6781
924263b4df10 eq reworked
alex
parents: 6755
diff changeset
2928 } break;
924263b4df10 eq reworked
alex
parents: 6755
diff changeset
2929 case MP_CMD_HUE : {
924263b4df10 eq reworked
alex
parents: 6755
diff changeset
2930 int v = cmd->args[0].v.i, abs = cmd->args[1].v.i;
6786
b16cb6cbff5a eq reworked
alex
parents: 6784
diff changeset
2931
b16cb6cbff5a eq reworked
alex
parents: 6784
diff changeset
2932 if (!sh_video)
b16cb6cbff5a eq reworked
alex
parents: 6784
diff changeset
2933 break;
b16cb6cbff5a eq reworked
alex
parents: 6784
diff changeset
2934
b16cb6cbff5a eq reworked
alex
parents: 6784
diff changeset
2935 if (vo_gamma_hue == 1000)
b16cb6cbff5a eq reworked
alex
parents: 6784
diff changeset
2936 {
b16cb6cbff5a eq reworked
alex
parents: 6784
diff changeset
2937 vo_gamma_hue = 0;
b16cb6cbff5a eq reworked
alex
parents: 6784
diff changeset
2938 get_video_colors(sh_video, "hue", &vo_gamma_hue);
b16cb6cbff5a eq reworked
alex
parents: 6784
diff changeset
2939 }
6781
924263b4df10 eq reworked
alex
parents: 6755
diff changeset
2940
924263b4df10 eq reworked
alex
parents: 6755
diff changeset
2941 if (abs)
924263b4df10 eq reworked
alex
parents: 6755
diff changeset
2942 vo_gamma_hue = v;
924263b4df10 eq reworked
alex
parents: 6755
diff changeset
2943 else
924263b4df10 eq reworked
alex
parents: 6755
diff changeset
2944 vo_gamma_hue += v;
924263b4df10 eq reworked
alex
parents: 6755
diff changeset
2945
924263b4df10 eq reworked
alex
parents: 6755
diff changeset
2946 if (vo_gamma_hue > 100)
924263b4df10 eq reworked
alex
parents: 6755
diff changeset
2947 vo_gamma_hue = 100;
924263b4df10 eq reworked
alex
parents: 6755
diff changeset
2948 else if (vo_gamma_hue < -100)
924263b4df10 eq reworked
alex
parents: 6755
diff changeset
2949 vo_gamma_hue = -100;
924263b4df10 eq reworked
alex
parents: 6755
diff changeset
2950 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
2951 #ifdef USE_OSD
6781
924263b4df10 eq reworked
alex
parents: 6755
diff changeset
2952 if(osd_level){
924263b4df10 eq reworked
alex
parents: 6755
diff changeset
2953 osd_visible=sh_video->fps; // 1 sec
924263b4df10 eq reworked
alex
parents: 6755
diff changeset
2954 vo_osd_progbar_type=OSD_HUE;
924263b4df10 eq reworked
alex
parents: 6755
diff changeset
2955 vo_osd_progbar_value=(vo_gamma_hue<<7)/100 + 128;
924263b4df10 eq reworked
alex
parents: 6755
diff changeset
2956 vo_osd_changed(OSDTYPE_PROGBAR);
924263b4df10 eq reworked
alex
parents: 6755
diff changeset
2957 }
924263b4df10 eq reworked
alex
parents: 6755
diff changeset
2958 #endif // USE_OSD
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2959 }
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2960 } break;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2961 case MP_CMD_FRAMEDROPPING : {
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2962 int v = cmd->args[0].v.i;
11936
0fc4416a0173 Display Framedropping state on the OSD.
diego
parents: 11875
diff changeset
2963 if(v < 0){
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2964 frame_dropping = (frame_dropping+1)%3;
11936
0fc4416a0173 Display Framedropping state on the OSD.
diego
parents: 11875
diff changeset
2965 #ifdef USE_OSD
0fc4416a0173 Display Framedropping state on the OSD.
diego
parents: 11875
diff changeset
2966 osd_show_framedropping=10;
0fc4416a0173 Display Framedropping state on the OSD.
diego
parents: 11875
diff changeset
2967 vo_osd_changed(OSDTYPE_SUBTITLE);
0fc4416a0173 Display Framedropping state on the OSD.
diego
parents: 11875
diff changeset
2968 #endif
0fc4416a0173 Display Framedropping state on the OSD.
diego
parents: 11875
diff changeset
2969 }
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2970 else
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2971 frame_dropping = v > 2 ? 2 : v;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2972 } break;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2973 #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
2974 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
2975 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
2976 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
2977 } break;
141141fdd250 I'd like to change tv tuner frequency in the slave mode. So this patch
gabucino
parents: 10453
diff changeset
2978 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
2979 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
2980 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
2981 } break;
10577
7e5733a8c33b Hi, here are slave commands:
gabucino
parents: 10560
diff changeset
2982 case MP_CMD_TV_SET_BRIGHTNESS : {
7e5733a8c33b Hi, here are slave commands:
gabucino
parents: 10560
diff changeset
2983 if (file_format == DEMUXER_TYPE_TV)
7e5733a8c33b Hi, here are slave commands:
gabucino
parents: 10560
diff changeset
2984 tv_set_color_options((tvi_handle_t*)(demuxer->priv), TV_COLOR_BRIGHTNESS, cmd->args[0].v.i);
7e5733a8c33b Hi, here are slave commands:
gabucino
parents: 10560
diff changeset
2985 } break;
7e5733a8c33b Hi, here are slave commands:
gabucino
parents: 10560
diff changeset
2986 case MP_CMD_TV_SET_HUE : {
7e5733a8c33b Hi, here are slave commands:
gabucino
parents: 10560
diff changeset
2987 if (file_format == DEMUXER_TYPE_TV)
7e5733a8c33b Hi, here are slave commands:
gabucino
parents: 10560
diff changeset
2988 tv_set_color_options((tvi_handle_t*)(demuxer->priv), TV_COLOR_HUE, cmd->args[0].v.i);
7e5733a8c33b Hi, here are slave commands:
gabucino
parents: 10560
diff changeset
2989 } break;
7e5733a8c33b Hi, here are slave commands:
gabucino
parents: 10560
diff changeset
2990 case MP_CMD_TV_SET_SATURATION : {
7e5733a8c33b Hi, here are slave commands:
gabucino
parents: 10560
diff changeset
2991 if (file_format == DEMUXER_TYPE_TV)
7e5733a8c33b Hi, here are slave commands:
gabucino
parents: 10560
diff changeset
2992 tv_set_color_options((tvi_handle_t*)(demuxer->priv), TV_COLOR_SATURATION, cmd->args[0].v.i);
7e5733a8c33b Hi, here are slave commands:
gabucino
parents: 10560
diff changeset
2993 } break;
7e5733a8c33b Hi, here are slave commands:
gabucino
parents: 10560
diff changeset
2994 case MP_CMD_TV_SET_CONTRAST : {
7e5733a8c33b Hi, here are slave commands:
gabucino
parents: 10560
diff changeset
2995 if (file_format == DEMUXER_TYPE_TV)
7e5733a8c33b Hi, here are slave commands:
gabucino
parents: 10560
diff changeset
2996 tv_set_color_options((tvi_handle_t*)(demuxer->priv), TV_COLOR_CONTRAST, cmd->args[0].v.i);
7e5733a8c33b Hi, here are slave commands:
gabucino
parents: 10560
diff changeset
2997 } break;
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2998 case MP_CMD_TV_STEP_CHANNEL : {
9752
3db72324a0fe Stream cleanup, don't use blah_on options anymore.
albeu
parents: 9695
diff changeset
2999 if (file_format == DEMUXER_TYPE_TV) {
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
3000 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
3001 if(v > 0){
7419
alex
parents: 7329
diff changeset
3002 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
3003 #ifdef USE_OSD
14ab71b47a58 user friendly channel tuning + 10L fix in tvi_v4l (by Stephane Jourdois)
henry
parents: 8619
diff changeset
3004 if (tv_channel_list) {
14ab71b47a58 user friendly channel tuning + 10L fix in tvi_v4l (by Stephane Jourdois)
henry
parents: 8619
diff changeset
3005 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
3006 vo_osd_changed(OSDTYPE_SUBTITLE);
14ab71b47a58 user friendly channel tuning + 10L fix in tvi_v4l (by Stephane Jourdois)
henry
parents: 8619
diff changeset
3007 }
14ab71b47a58 user friendly channel tuning + 10L fix in tvi_v4l (by Stephane Jourdois)
henry
parents: 8619
diff changeset
3008 #endif
14ab71b47a58 user friendly channel tuning + 10L fix in tvi_v4l (by Stephane Jourdois)
henry
parents: 8619
diff changeset
3009 } else {
7419
alex
parents: 7329
diff changeset
3010 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
3011 #ifdef USE_OSD
14ab71b47a58 user friendly channel tuning + 10L fix in tvi_v4l (by Stephane Jourdois)
henry
parents: 8619
diff changeset
3012 if (tv_channel_list) {
14ab71b47a58 user friendly channel tuning + 10L fix in tvi_v4l (by Stephane Jourdois)
henry
parents: 8619
diff changeset
3013 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
3014 vo_osd_changed(OSDTYPE_SUBTITLE);
14ab71b47a58 user friendly channel tuning + 10L fix in tvi_v4l (by Stephane Jourdois)
henry
parents: 8619
diff changeset
3015 }
14ab71b47a58 user friendly channel tuning + 10L fix in tvi_v4l (by Stephane Jourdois)
henry
parents: 8619
diff changeset
3016 #endif
14ab71b47a58 user friendly channel tuning + 10L fix in tvi_v4l (by Stephane Jourdois)
henry
parents: 8619
diff changeset
3017 }
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
3018 }
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents: 9593
diff changeset
3019 }
76c6d8f1ebf5 this is a combo patch that:
arpi
parents: 9593
diff changeset
3020 #ifdef HAS_DVBIN_SUPPORT
10560
11826d9f90c7 this patch fixes
arpi
parents: 10557
diff changeset
3021 if((stream->type == STREAMTYPE_DVB) && stream->priv)
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents: 9593
diff changeset
3022 {
10560
11826d9f90c7 this patch fixes
arpi
parents: 10557
diff changeset
3023 dvb_priv_t *priv = (dvb_priv_t*) stream->priv;
11826d9f90c7 this patch fixes
arpi
parents: 10557
diff changeset
3024 if(priv->is_on)
11826d9f90c7 this patch fixes
arpi
parents: 10557
diff changeset
3025 {
11826d9f90c7 this patch fixes
arpi
parents: 10557
diff changeset
3026 int dir;
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents: 9593
diff changeset
3027 int v = cmd->args[0].v.i;
10708
a57e8d980652 This patch fixes:
alex
parents: 10707
diff changeset
3028
a57e8d980652 This patch fixes:
alex
parents: 10707
diff changeset
3029 last_dvb_step = v;
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents: 9593
diff changeset
3030 if(v > 0)
10560
11826d9f90c7 this patch fixes
arpi
parents: 10557
diff changeset
3031 dir = DVB_CHANNEL_HIGHER;
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents: 9593
diff changeset
3032 else
10560
11826d9f90c7 this patch fixes
arpi
parents: 10557
diff changeset
3033 dir = DVB_CHANNEL_LOWER;
11826d9f90c7 this patch fixes
arpi
parents: 10557
diff changeset
3034
11826d9f90c7 this patch fixes
arpi
parents: 10557
diff changeset
3035
11826d9f90c7 this patch fixes
arpi
parents: 10557
diff changeset
3036 if(dvb_step_channel(priv, dir))
11826d9f90c7 this patch fixes
arpi
parents: 10557
diff changeset
3037 {
10707
0d9ef9b4841c dvb channel changing vs input system (lirc) fix by David Kuehling <dvdkhlng@gmx.de>
alex
parents: 10691
diff changeset
3038 uninit_player(INITED_ALL-(INITED_STREAM|INITED_INPUT));
11352
d8b1f7509df2 Patch by Nico <nsabbi@libero.it>
attila
parents: 11331
diff changeset
3039 cache_uninit(stream);
d8b1f7509df2 Patch by Nico <nsabbi@libero.it>
attila
parents: 11331
diff changeset
3040 goto goto_enable_cache;
10560
11826d9f90c7 this patch fixes
arpi
parents: 10557
diff changeset
3041 }
11826d9f90c7 this patch fixes
arpi
parents: 10557
diff changeset
3042 }
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents: 9593
diff changeset
3043 }
10560
11826d9f90c7 this patch fixes
arpi
parents: 10557
diff changeset
3044 #endif
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents: 9593
diff changeset
3045 break;
8494
47cf94058137 add a TV_SET_CNANNEL command
henry
parents: 8467
diff changeset
3046 case MP_CMD_TV_SET_CHANNEL : {
9752
3db72324a0fe Stream cleanup, don't use blah_on options anymore.
albeu
parents: 9695
diff changeset
3047 if (file_format == DEMUXER_TYPE_TV) {
8494
47cf94058137 add a TV_SET_CNANNEL command
henry
parents: 8467
diff changeset
3048 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
3049 #ifdef USE_OSD
14ab71b47a58 user friendly channel tuning + 10L fix in tvi_v4l (by Stephane Jourdois)
henry
parents: 8619
diff changeset
3050 if (tv_channel_list) {
14ab71b47a58 user friendly channel tuning + 10L fix in tvi_v4l (by Stephane Jourdois)
henry
parents: 8619
diff changeset
3051 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
3052 vo_osd_changed(OSDTYPE_SUBTITLE);
14ab71b47a58 user friendly channel tuning + 10L fix in tvi_v4l (by Stephane Jourdois)
henry
parents: 8619
diff changeset
3053 }
14ab71b47a58 user friendly channel tuning + 10L fix in tvi_v4l (by Stephane Jourdois)
henry
parents: 8619
diff changeset
3054 #endif
14ab71b47a58 user friendly channel tuning + 10L fix in tvi_v4l (by Stephane Jourdois)
henry
parents: 8619
diff changeset
3055 }
14ab71b47a58 user friendly channel tuning + 10L fix in tvi_v4l (by Stephane Jourdois)
henry
parents: 8619
diff changeset
3056 } break;
10560
11826d9f90c7 this patch fixes
arpi
parents: 10557
diff changeset
3057 #ifdef HAS_DVBIN_SUPPORT
11826d9f90c7 this patch fixes
arpi
parents: 10557
diff changeset
3058 case MP_CMD_DVB_SET_CHANNEL:
11826d9f90c7 this patch fixes
arpi
parents: 10557
diff changeset
3059 {
11826d9f90c7 this patch fixes
arpi
parents: 10557
diff changeset
3060 if((stream->type == STREAMTYPE_DVB) && stream->priv)
11826d9f90c7 this patch fixes
arpi
parents: 10557
diff changeset
3061 {
11826d9f90c7 this patch fixes
arpi
parents: 10557
diff changeset
3062 dvb_priv_t *priv = (dvb_priv_t*) stream->priv;
11826d9f90c7 this patch fixes
arpi
parents: 10557
diff changeset
3063 if(priv->is_on)
11826d9f90c7 this patch fixes
arpi
parents: 10557
diff changeset
3064 {
10708
a57e8d980652 This patch fixes:
alex
parents: 10707
diff changeset
3065 if(priv->list->current <= cmd->args[0].v.i)
a57e8d980652 This patch fixes:
alex
parents: 10707
diff changeset
3066 last_dvb_step = 1;
a57e8d980652 This patch fixes:
alex
parents: 10707
diff changeset
3067 else
a57e8d980652 This patch fixes:
alex
parents: 10707
diff changeset
3068 last_dvb_step = -1;
a57e8d980652 This patch fixes:
alex
parents: 10707
diff changeset
3069
12306
661a6e80030f slave command dvb_set_channel now takes 2 arguments: channel card
nicodvb
parents: 12207
diff changeset
3070 if(dvb_set_channel(priv, cmd->args[1].v.i, cmd->args[0].v.i))
10560
11826d9f90c7 this patch fixes
arpi
parents: 10557
diff changeset
3071 {
10707
0d9ef9b4841c dvb channel changing vs input system (lirc) fix by David Kuehling <dvdkhlng@gmx.de>
alex
parents: 10691
diff changeset
3072 uninit_player(INITED_ALL-(INITED_STREAM|INITED_INPUT));
11352
d8b1f7509df2 Patch by Nico <nsabbi@libero.it>
attila
parents: 11331
diff changeset
3073 cache_uninit(stream);
d8b1f7509df2 Patch by Nico <nsabbi@libero.it>
attila
parents: 11331
diff changeset
3074 goto goto_enable_cache;
10560
11826d9f90c7 this patch fixes
arpi
parents: 10557
diff changeset
3075 }
11826d9f90c7 this patch fixes
arpi
parents: 10557
diff changeset
3076 }
11826d9f90c7 this patch fixes
arpi
parents: 10557
diff changeset
3077 }
11826d9f90c7 this patch fixes
arpi
parents: 10557
diff changeset
3078 }
11826d9f90c7 this patch fixes
arpi
parents: 10557
diff changeset
3079 #endif
8627
14ab71b47a58 user friendly channel tuning + 10L fix in tvi_v4l (by Stephane Jourdois)
henry
parents: 8619
diff changeset
3080 case MP_CMD_TV_LAST_CHANNEL : {
9752
3db72324a0fe Stream cleanup, don't use blah_on options anymore.
albeu
parents: 9695
diff changeset
3081 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
3082 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
3083 #ifdef USE_OSD
14ab71b47a58 user friendly channel tuning + 10L fix in tvi_v4l (by Stephane Jourdois)
henry
parents: 8619
diff changeset
3084 if (tv_channel_list) {
14ab71b47a58 user friendly channel tuning + 10L fix in tvi_v4l (by Stephane Jourdois)
henry
parents: 8619
diff changeset
3085 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
3086 vo_osd_changed(OSDTYPE_SUBTITLE);
14ab71b47a58 user friendly channel tuning + 10L fix in tvi_v4l (by Stephane Jourdois)
henry
parents: 8619
diff changeset
3087 }
14ab71b47a58 user friendly channel tuning + 10L fix in tvi_v4l (by Stephane Jourdois)
henry
parents: 8619
diff changeset
3088 #endif
14ab71b47a58 user friendly channel tuning + 10L fix in tvi_v4l (by Stephane Jourdois)
henry
parents: 8619
diff changeset
3089 }
8494
47cf94058137 add a TV_SET_CNANNEL command
henry
parents: 8467
diff changeset
3090 } break;
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
3091 case MP_CMD_TV_STEP_NORM : {
9752
3db72324a0fe Stream cleanup, don't use blah_on options anymore.
albeu
parents: 9695
diff changeset
3092 if (file_format == DEMUXER_TYPE_TV)
7419
alex
parents: 7329
diff changeset
3093 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
3094 } break;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
3095 case MP_CMD_TV_STEP_CHANNEL_LIST : {
9752
3db72324a0fe Stream cleanup, don't use blah_on options anymore.
albeu
parents: 9695
diff changeset
3096 if (file_format == DEMUXER_TYPE_TV)
7419
alex
parents: 7329
diff changeset
3097 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
3098 } break;
4849
9be4ac85dd35 Moved the call to VOCTRL_FULLSCREEN outside of #ifdef USE_TV block
albeu
parents: 4844
diff changeset
3099 #endif
13228
a47aaa6b7324 slave mode command to en/disable vsync, patch by Aurelien Jacobs <aurel at gnuage.org>
faust3
parents: 13168
diff changeset
3100 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
3101 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
3102 } break;
4733
5bad0d74f6ea standard key support for video out runtime fullscreen switching
alex
parents: 4693
diff changeset
3103 case MP_CMD_VO_FULLSCREEN:
5bad0d74f6ea standard key support for video out runtime fullscreen switching
alex
parents: 4693
diff changeset
3104 {
4858
65730cea02e7 add half new input support for gui
pontscho
parents: 4856
diff changeset
3105 #ifdef HAVE_NEW_GUI
65730cea02e7 add half new input support for gui
pontscho
parents: 4856
diff changeset
3106 if ( use_gui ) guiGetEvent( guiIEvent,(char *)MP_CMD_GUI_FULLSCREEN );
65730cea02e7 add half new input support for gui
pontscho
parents: 4856
diff changeset
3107 else
65730cea02e7 add half new input support for gui
pontscho
parents: 4856
diff changeset
3108 #endif
5511
7a24a067f0af vo_config_count now counts calls to vo->config()
arpi
parents: 5507
diff changeset
3109 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
3110 } break;
11542
85e503ddf65f runtime 'stay-on-top' functionality
joey
parents: 11352
diff changeset
3111 case MP_CMD_VO_ONTOP:
85e503ddf65f runtime 'stay-on-top' functionality
joey
parents: 11352
diff changeset
3112 {
85e503ddf65f runtime 'stay-on-top' functionality
joey
parents: 11352
diff changeset
3113 if(video_out && vo_config_count) {
85e503ddf65f runtime 'stay-on-top' functionality
joey
parents: 11352
diff changeset
3114 video_out->control(VOCTRL_ONTOP, 0);
85e503ddf65f runtime 'stay-on-top' functionality
joey
parents: 11352
diff changeset
3115 #ifdef USE_OSD
85e503ddf65f runtime 'stay-on-top' functionality
joey
parents: 11352
diff changeset
3116 osd_show_ontop=10;
85e503ddf65f runtime 'stay-on-top' functionality
joey
parents: 11352
diff changeset
3117 vo_osd_changed(OSDTYPE_SUBTITLE);
85e503ddf65f runtime 'stay-on-top' functionality
joey
parents: 11352
diff changeset
3118 #endif
85e503ddf65f runtime 'stay-on-top' functionality
joey
parents: 11352
diff changeset
3119 }
85e503ddf65f runtime 'stay-on-top' functionality
joey
parents: 11352
diff changeset
3120
85e503ddf65f runtime 'stay-on-top' functionality
joey
parents: 11352
diff changeset
3121 } break;
13091
25f51c72eb06 added runtime toggle of root window playback
joey
parents: 13089
diff changeset
3122 case MP_CMD_VO_ROOTWIN:
25f51c72eb06 added runtime toggle of root window playback
joey
parents: 13089
diff changeset
3123 {
25f51c72eb06 added runtime toggle of root window playback
joey
parents: 13089
diff changeset
3124 if(video_out && vo_config_count) {
25f51c72eb06 added runtime toggle of root window playback
joey
parents: 13089
diff changeset
3125 video_out->control(VOCTRL_ROOTWIN, 0);
25f51c72eb06 added runtime toggle of root window playback
joey
parents: 13089
diff changeset
3126 #ifdef USE_OSD
25f51c72eb06 added runtime toggle of root window playback
joey
parents: 13089
diff changeset
3127 osd_show_rootwin=10;
25f51c72eb06 added runtime toggle of root window playback
joey
parents: 13089
diff changeset
3128 vo_osd_changed(OSDTYPE_SUBTITLE);
25f51c72eb06 added runtime toggle of root window playback
joey
parents: 13089
diff changeset
3129 #endif
25f51c72eb06 added runtime toggle of root window playback
joey
parents: 13089
diff changeset
3130 }
25f51c72eb06 added runtime toggle of root window playback
joey
parents: 13089
diff changeset
3131
25f51c72eb06 added runtime toggle of root window playback
joey
parents: 13089
diff changeset
3132 } break;
6304
ee65527096c2 pan&scan support with -vo xv by ?? <mplayer@svennevid.net>
arpi
parents: 6280
diff changeset
3133 case MP_CMD_PANSCAN : {
6311
da2dda48b7ec add mute support ( step 1 ) and fixed panscan bugs (1000l for me)
pontscho
parents: 6307
diff changeset
3134 if ( !video_out ) break;
6307
72c87b2ec779 added panscan support for xmga/xvidix
pontscho
parents: 6304
diff changeset
3135 if ( video_out->control( VOCTRL_GET_PANSCAN,NULL ) == VO_TRUE )
72c87b2ec779 added panscan support for xmga/xvidix
pontscho
parents: 6304
diff changeset
3136 {
72c87b2ec779 added panscan support for xmga/xvidix
pontscho
parents: 6304
diff changeset
3137 int abs= cmd->args[1].v.i;
72c87b2ec779 added panscan support for xmga/xvidix
pontscho
parents: 6304
diff changeset
3138 float v = cmd->args[0].v.f;
72c87b2ec779 added panscan support for xmga/xvidix
pontscho
parents: 6304
diff changeset
3139 float res;
72c87b2ec779 added panscan support for xmga/xvidix
pontscho
parents: 6304
diff changeset
3140 if(abs) res = v;
72c87b2ec779 added panscan support for xmga/xvidix
pontscho
parents: 6304
diff changeset
3141 else res = vo_panscan+v;
72c87b2ec779 added panscan support for xmga/xvidix
pontscho
parents: 6304
diff changeset
3142 vo_panscan = res > 1 ? 1 : res < 0 ? 0 : res;
72c87b2ec779 added panscan support for xmga/xvidix
pontscho
parents: 6304
diff changeset
3143 video_out->control( VOCTRL_SET_PANSCAN,NULL );
6304
ee65527096c2 pan&scan support with -vo xv by ?? <mplayer@svennevid.net>
arpi
parents: 6280
diff changeset
3144 #ifdef USE_OSD
7923
bad21f499a9e avoids segfaults w.r.t to mp3 files handling:
pl
parents: 7906
diff changeset
3145 if(osd_level && sh_video){
6307
72c87b2ec779 added panscan support for xmga/xvidix
pontscho
parents: 6304
diff changeset
3146 osd_visible=sh_video->fps; // 1 sec
72c87b2ec779 added panscan support for xmga/xvidix
pontscho
parents: 6304
diff changeset
3147 vo_osd_progbar_type=OSD_PANSCAN;
72c87b2ec779 added panscan support for xmga/xvidix
pontscho
parents: 6304
diff changeset
3148 vo_osd_progbar_value=vo_panscan*256;
72c87b2ec779 added panscan support for xmga/xvidix
pontscho
parents: 6304
diff changeset
3149 vo_osd_changed(OSDTYPE_PROGBAR);
8819
477d42e66e8b Update font scale after changing pancan.
filon
parents: 8800
diff changeset
3150 #ifdef HAVE_FREETYPE
9346
eb760cafaf75 minor fixes for font autoscaling
henry
parents: 9336
diff changeset
3151 if (subtitle_autoscale == 2 || subtitle_autoscale == 3)
eb760cafaf75 minor fixes for font autoscaling
henry
parents: 9336
diff changeset
3152 // force scaling font to movie width or diagonal
8819
477d42e66e8b Update font scale after changing pancan.
filon
parents: 8800
diff changeset
3153 force_load_font = 1;
477d42e66e8b Update font scale after changing pancan.
filon
parents: 8800
diff changeset
3154 #endif
6307
72c87b2ec779 added panscan support for xmga/xvidix
pontscho
parents: 6304
diff changeset
3155 }
6304
ee65527096c2 pan&scan support with -vo xv by ?? <mplayer@svennevid.net>
arpi
parents: 6280
diff changeset
3156 #endif
6307
72c87b2ec779 added panscan support for xmga/xvidix
pontscho
parents: 6304
diff changeset
3157 }
6304
ee65527096c2 pan&scan support with -vo xv by ?? <mplayer@svennevid.net>
arpi
parents: 6280
diff changeset
3158 } break;
5015
9842148f6053 -subpos key bindings with new input layer - patch by Tomas Konir <moje@molly.vabo.cz>
arpi
parents: 4981
diff changeset
3159 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
3160 {
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
3161 #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
3162 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
3163 int v;
9842148f6053 -subpos key bindings with new input layer - patch by Tomas Konir <moje@molly.vabo.cz>
arpi
parents: 4981
diff changeset
3164 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
3165
9842148f6053 -subpos key bindings with new input layer - patch by Tomas Konir <moje@molly.vabo.cz>
arpi
parents: 4981
diff changeset
3166 sub_pos+=v;
9842148f6053 -subpos key bindings with new input layer - patch by Tomas Konir <moje@molly.vabo.cz>
arpi
parents: 4981
diff changeset
3167 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
3168 if(sub_pos <0) sub_pos=0;
5640
a0cee3bb7f78 osd: calculating bbox
arpi
parents: 5638
diff changeset
3169 vo_osd_changed(OSDTYPE_SUBTITLE);
8366
3e3b30d16719 With this patch the text 'Sub position: x/100' is displayed
arpi
parents: 8365
diff changeset
3170 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
3171 }
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
3172 #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
3173 } break;
8534
922ce27eb683 This patch adds support for vertical subtitle alignment
arpi
parents: 8531
diff changeset
3174 case MP_CMD_SUB_ALIGNMENT:
922ce27eb683 This patch adds support for vertical subtitle alignment
arpi
parents: 8531
diff changeset
3175 {
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
3176 #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
3177 if (sh_video) {
8534
922ce27eb683 This patch adds support for vertical subtitle alignment
arpi
parents: 8531
diff changeset
3178 if (cmd->nargs >= 1)
922ce27eb683 This patch adds support for vertical subtitle alignment
arpi
parents: 8531
diff changeset
3179 sub_alignment = cmd->args[0].v.i;
922ce27eb683 This patch adds support for vertical subtitle alignment
arpi
parents: 8531
diff changeset
3180 else
922ce27eb683 This patch adds support for vertical subtitle alignment
arpi
parents: 8531
diff changeset
3181 sub_alignment = (sub_alignment+1) % 3;
922ce27eb683 This patch adds support for vertical subtitle alignment
arpi
parents: 8531
diff changeset
3182 osd_show_sub_alignment = 9;
922ce27eb683 This patch adds support for vertical subtitle alignment
arpi
parents: 8531
diff changeset
3183 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
3184 }
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
3185 #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
3186 } break;
7628
d6608342591d This patch adds the functionality to disable/enable subtitles while playing
arpi
parents: 7621
diff changeset
3187 case MP_CMD_SUB_VISIBILITY:
d6608342591d This patch adds the functionality to disable/enable subtitles while playing
arpi
parents: 7621
diff changeset
3188 {
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
3189 #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
3190 if (sh_video) {
7628
d6608342591d This patch adds the functionality to disable/enable subtitles while playing
arpi
parents: 7621
diff changeset
3191 sub_visibility=1-sub_visibility;
d6608342591d This patch adds the functionality to disable/enable subtitles while playing
arpi
parents: 7621
diff changeset
3192 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
3193 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
3194 }
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
3195 #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
3196 } 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
3197 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
3198 {
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
3199 #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
3200 if (sh_video) {
13577
606d90e03a2f printf --> mp_msg conversion
diego
parents: 13502
diff changeset
3201 mp_msg(MSGT_GLOBAL,MSGL_INFO,MSGTR_AnsSubVisibility, sub_visibility);
10884
bbdaa93c469e slave mode commands to print out vo_fs and sub_visibility globals, patch by Mike Swieton <swietonm at student.gvsu.edu>
faust3
parents: 10718
diff changeset
3202 }
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
3203 #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
3204 } break;
12841
96b807836eca individual sub_select option not interferring with vobsub_lang
alex
parents: 12835
diff changeset
3205 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
3206 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
3207 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
3208
a5004eb92a79 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 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
3210 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
3211 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
3212 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
3213 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
3214
a5004eb92a79 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 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
3216 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
3217 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
3218 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
3219
a5004eb92a79 fix sub_select fiasco with global sub numbering. now multiple sub sources can be managed in essentially one list.
joey
parents: 13500
diff changeset
3220 #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
3221 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
3222 subdata = NULL;
9870
09d630a4f991 support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents: 9831
diff changeset
3223 vo_sub = NULL;
09d630a4f991 support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents: 9831
diff changeset
3224 #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
3225 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
3226 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
3227 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
3228
a5004eb92a79 fix sub_select fiasco with global sub numbering. now multiple sub sources can be managed in essentially one list.
joey
parents: 13500
diff changeset
3229 // 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
3230 // 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
3231 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
3232 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
3233
a5004eb92a79 fix sub_select fiasco with global sub numbering. now multiple sub sources can be managed in essentially one list.
joey
parents: 13500
diff changeset
3234 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
3235 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
3236 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
3237 #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
3238 } 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
3239 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
3240 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
3241 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
3242 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
3243
a5004eb92a79 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 // 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
3245 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
3246 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
3247 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
3248 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
3249 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
3250 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
3251 #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
3252 } 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
3253 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
3254 if (d_dvdsub) {
13092
36701f60f093 forgot some ifdef's and broke mplayer.c without ogg & dvdread
joey
parents: 13091
diff changeset
3255 #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
3256 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
3257 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
3258 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
3259 }
13092
36701f60f093 forgot some ifdef's and broke mplayer.c without ogg & dvdread
joey
parents: 13091
diff changeset
3260 #endif
36701f60f093 forgot some ifdef's and broke mplayer.c without ogg & dvdread
joey
parents: 13091
diff changeset
3261 #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
3262 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
3263 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
3264 #endif
13126
b59e16a8dfc7 Support for subtitle switching in Matroska.
mosu
parents: 13122
diff changeset
3265 #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
3266 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
3267 d_dvdsub->id = demux_mkv_change_subs(demuxer, dvdsub_id);
13126
b59e16a8dfc7 Support for subtitle switching in Matroska.
mosu
parents: 13122
diff changeset
3268 if (d_dvdsub->id >= 0 && ((mkv_sh_sub_t *)d_dvdsub->sh)->type == 'v') {
b59e16a8dfc7 Support for subtitle switching in Matroska.
mosu
parents: 13122
diff changeset
3269 mkv_sh_sub_t *mkv_sh_sub = (mkv_sh_sub_t *)d_dvdsub->sh;
b59e16a8dfc7 Support for subtitle switching in Matroska.
mosu
parents: 13122
diff changeset
3270 if (vo_spudec != NULL)
b59e16a8dfc7 Support for subtitle switching in Matroska.
mosu
parents: 13122
diff changeset
3271 spudec_free(vo_spudec);
b59e16a8dfc7 Support for subtitle switching in Matroska.
mosu
parents: 13122
diff changeset
3272 vo_spudec =
b59e16a8dfc7 Support for subtitle switching in Matroska.
mosu
parents: 13122
diff changeset
3273 spudec_new_scaled_vobsub(mkv_sh_sub->palette, mkv_sh_sub->colors,
b59e16a8dfc7 Support for subtitle switching in Matroska.
mosu
parents: 13122
diff changeset
3274 mkv_sh_sub->custom_colors,
b59e16a8dfc7 Support for subtitle switching in Matroska.
mosu
parents: 13122
diff changeset
3275 mkv_sh_sub->width,
b59e16a8dfc7 Support for subtitle switching in Matroska.
mosu
parents: 13122
diff changeset
3276 mkv_sh_sub->height);
b59e16a8dfc7 Support for subtitle switching in Matroska.
mosu
parents: 13122
diff changeset
3277 if (!forced_subs_only)
b59e16a8dfc7 Support for subtitle switching in Matroska.
mosu
parents: 13122
diff changeset
3278 forced_subs_only = mkv_sh_sub->forced_subs_only;
b59e16a8dfc7 Support for subtitle switching in Matroska.
mosu
parents: 13122
diff changeset
3279 if (vo_spudec) {
b59e16a8dfc7 Support for subtitle switching in Matroska.
mosu
parents: 13122
diff changeset
3280 spudec_set_forced_subs_only(vo_spudec, forced_subs_only);
b59e16a8dfc7 Support for subtitle switching in Matroska.
mosu
parents: 13122
diff changeset
3281 inited_flags |= INITED_SPUDEC;
b59e16a8dfc7 Support for subtitle switching in Matroska.
mosu
parents: 13122
diff changeset
3282 }
b59e16a8dfc7 Support for subtitle switching in Matroska.
mosu
parents: 13122
diff changeset
3283 }
b59e16a8dfc7 Support for subtitle switching in Matroska.
mosu
parents: 13122
diff changeset
3284 }
b59e16a8dfc7 Support for subtitle switching in Matroska.
mosu
parents: 13122
diff changeset
3285 #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
3286 }
a5004eb92a79 fix sub_select fiasco with global sub numbering. now multiple sub sources can be managed in essentially one list.
joey
parents: 13500
diff changeset
3287 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
3288 } 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
3289 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
3290 #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
3291 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
3292 #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
3293 }
a5004eb92a79 fix sub_select fiasco with global sub numbering. now multiple sub sources can be managed in essentially one list.
joey
parents: 13500
diff changeset
3294 // 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
3295 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
3296 }
9870
09d630a4f991 support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents: 9831
diff changeset
3297 break;
10917
d45870f67728 Forced subtitles patch by Arne Driescher <driescher@mpi-magdeburg.mpg.de>
attila
parents: 10884
diff changeset
3298 case MP_CMD_SUB_FORCED_ONLY:
d45870f67728 Forced subtitles patch by Arne Driescher <driescher@mpi-magdeburg.mpg.de>
attila
parents: 10884
diff changeset
3299 if (vo_spudec) {
d45870f67728 Forced subtitles patch by Arne Driescher <driescher@mpi-magdeburg.mpg.de>
attila
parents: 10884
diff changeset
3300 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
3301 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
3302 }
d45870f67728 Forced subtitles patch by Arne Driescher <driescher@mpi-magdeburg.mpg.de>
attila
parents: 10884
diff changeset
3303 break;
6112
69b3c25728fb Add the forgoten scrennshot command
albeu
parents: 6110
diff changeset
3304 case MP_CMD_SCREENSHOT :
69b3c25728fb Add the forgoten scrennshot command
albeu
parents: 6110
diff changeset
3305 if(vo_config_count) video_out->control(VOCTRL_SCREENSHOT, NULL);
69b3c25728fb Add the forgoten scrennshot command
albeu
parents: 6110
diff changeset
3306 break;
6888
2dde1a1bc03a Add the input command "change_rectangle" to control the rectangle
kmkaplan
parents: 6871
diff changeset
3307 case MP_CMD_VF_CHANGE_RECTANGLE:
2dde1a1bc03a Add the input command "change_rectangle" to control the rectangle
kmkaplan
parents: 6871
diff changeset
3308 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
3309 break;
8364
137b7574c85f slave-mode commands to get movie length & pos
arpi
parents: 8363
diff changeset
3310
137b7574c85f slave-mode commands to get movie length & pos
arpi
parents: 8363
diff changeset
3311 case MP_CMD_GET_TIME_LENGTH : {
13577
606d90e03a2f printf --> mp_msg conversion
diego
parents: 13502
diff changeset
3312 mp_msg(MSGT_GLOBAL,MSGL_INFO,MSGTR_AnsLength, demuxer_get_time_length(demuxer));
8364
137b7574c85f slave-mode commands to get movie length & pos
arpi
parents: 8363
diff changeset
3313 } break;
137b7574c85f slave-mode commands to get movie length & pos
arpi
parents: 8363
diff changeset
3314
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
3315 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
3316 if(video_out && vo_config_count)
13577
606d90e03a2f printf --> mp_msg conversion
diego
parents: 13502
diff changeset
3317 mp_msg(MSGT_GLOBAL,MSGL_INFO,MSGTR_AnsVoFullscreen, vo_fs);
10884
bbdaa93c469e slave mode commands to print out vo_fs and sub_visibility globals, patch by Mike Swieton <swietonm at student.gvsu.edu>
faust3
parents: 10718
diff changeset
3318 } 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
3319
8364
137b7574c85f slave-mode commands to get movie length & pos
arpi
parents: 8363
diff changeset
3320 case MP_CMD_GET_PERCENT_POS : {
13577
606d90e03a2f printf --> mp_msg conversion
diego
parents: 13502
diff changeset
3321 mp_msg(MSGT_GLOBAL,MSGL_INFO,MSGTR_AnsPercentPos, demuxer_get_percent_pos(demuxer));
8364
137b7574c85f slave-mode commands to get movie length & pos
arpi
parents: 8363
diff changeset
3322 } 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
3323 #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
3324 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
3325 #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
3326 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
3327 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
3328 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
3329 }
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
3330 #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
3331 } 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
3332 #endif
8364
137b7574c85f slave-mode commands to get movie length & pos
arpi
parents: 8363
diff changeset
3333
5380
8a01cde9cf39 DVDnav support patch by David Holm and Kees Cook <mplayer@outflux.net>
arpi
parents: 5367
diff changeset
3334 #ifdef USE_DVDNAV
5489
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
3335 case MP_CMD_DVDNAV_EVENT: {
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
3336 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
3337 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
3338
5627
a05efac12472 dvdnav hotfix
arpi
parents: 5621
diff changeset
3339 /* ignore these events if we're not in dvd_nav mode */
9752
3db72324a0fe Stream cleanup, don't use blah_on options anymore.
albeu
parents: 9695
diff changeset
3340 if (stream->type != STREAMTYPE_DVDNAV) break;
5627
a05efac12472 dvdnav hotfix
arpi
parents: 5621
diff changeset
3341
5489
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
3342 if (!dvdnav_event) {
13577
606d90e03a2f printf --> mp_msg conversion
diego
parents: 13502
diff changeset
3343 mp_msg(MSGT_FIXME, MSGL_FIXME, MSGTR_DvdnavNullEvent);
5489
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
3344 break;
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
3345 }
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 //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
3348
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
3349 switch (dvdnav_event->event) {
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
3350 case DVDNAV_BLOCK_OK: {
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
3351 /* be silent about this one */
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_HIGHLIGHT: {
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
3355 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
3356 if (!hevent) {
13577
606d90e03a2f printf --> mp_msg conversion
diego
parents: 13502
diff changeset
3357 mp_msg(MSGT_FIXME, MSGL_FIXME, MSGTR_DvdnavHighlightEventBroken);
5489
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
3358 break;
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
3359 }
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
3360
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
3361 if (hevent->display && hevent->buttonN>0)
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
3362 {
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
3363 //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
3364 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
3365 hevent->buttonN,
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
3366 hevent->sx,hevent->sy,
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
3367 hevent->ex,hevent->ey,
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
3368 hevent->pts, d_video->pts);
13577
606d90e03a2f printf --> mp_msg conversion
diego
parents: 13502
diff changeset
3369 mp_msg(MSGT_FIXME, MSGL_FIXME, MSGTR_DvdnavEvent,dvd_nav_text);
5489
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
3370 //osd_show_dvd_nav_delay = 60;
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
3371
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
3372 osd_show_dvd_nav_highlight=1;
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
3373 osd_show_dvd_nav_sx=hevent->sx;
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
3374 osd_show_dvd_nav_ex=hevent->ex;
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
3375 osd_show_dvd_nav_sy=hevent->sy;
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
3376 osd_show_dvd_nav_ey=hevent->ey;
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 else {
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
3379 osd_show_dvd_nav_highlight=0;
13577
606d90e03a2f printf --> mp_msg conversion
diego
parents: 13502
diff changeset
3380 mp_msg(MSGT_FIXME, MSGL_FIXME, MSGTR_DvdnavHighlightHide);
5489
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
3381 }
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
3382 break;
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
3383 }
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
3384 case DVDNAV_STILL_FRAME: {
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
3385 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
3386
13577
606d90e03a2f printf --> mp_msg conversion
diego
parents: 13502
diff changeset
3387 mp_msg(MSGT_FIXME, MSGL_FIXME, MSGTR_DvdnavStillFrame, still_event->length );
5489
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
3388 while (dvdnav_stream_sleeping(dvdnav_priv)) {
9464
a4e50ab9ac14 3x10l found by Dan Christiansen <danchr@daimi.au.dk>
alex
parents: 9380
diff changeset
3389 usec_sleep(1000); /* 1ms */
5489
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
3390 }
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
3391 dvdnav_stream_sleep(dvdnav_priv,still_event->length);
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
3392 break;
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
3393 }
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
3394 case DVDNAV_STOP: {
13577
606d90e03a2f printf --> mp_msg conversion
diego
parents: 13502
diff changeset
3395 mp_msg(MSGT_FIXME, MSGL_FIXME, MSGTR_DvdnavNavStop );
5489
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
3396 break;
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
3397 }
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
3398 case DVDNAV_NOP: {
13577
606d90e03a2f printf --> mp_msg conversion
diego
parents: 13502
diff changeset
3399 mp_msg(MSGT_FIXME, MSGL_FIXME, MSGTR_DvdnavNavNOP);
5489
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
3400 break;
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
3401 }
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
3402 case DVDNAV_SPU_STREAM_CHANGE: {
6971
6fc2e5d5f323 dvdnav api changed
jonas
parents: 6954
diff changeset
3403 #if DVDNAVVERSION > 012
6fc2e5d5f323 dvdnav api changed
jonas
parents: 6954
diff changeset
3404 dvdnav_spu_stream_change_event_t *stream_change = (dvdnav_spu_stream_change_event_t*)(dvdnav_event->details);
6fc2e5d5f323 dvdnav api changed
jonas
parents: 6954
diff changeset
3405
13577
606d90e03a2f printf --> mp_msg conversion
diego
parents: 13502
diff changeset
3406 mp_msg(MSGT_FIXME, MSGL_FIXME, MSGTR_DvdnavNavSpuStreamChangeVerbose,
6971
6fc2e5d5f323 dvdnav api changed
jonas
parents: 6954
diff changeset
3407 stream_change->physical_wide,
6fc2e5d5f323 dvdnav api changed
jonas
parents: 6954
diff changeset
3408 stream_change->physical_letterbox,
6fc2e5d5f323 dvdnav api changed
jonas
parents: 6954
diff changeset
3409 stream_change->physical_pan_scan,
6fc2e5d5f323 dvdnav api changed
jonas
parents: 6954
diff changeset
3410 stream_change->logical);
6fc2e5d5f323 dvdnav api changed
jonas
parents: 6954
diff changeset
3411
6fc2e5d5f323 dvdnav api changed
jonas
parents: 6954
diff changeset
3412 if (vo_spudec && dvdsub_id!=stream_change->physical_wide) {
6fc2e5d5f323 dvdnav api changed
jonas
parents: 6954
diff changeset
3413 mp_msg(MSGT_INPUT,MSGL_DBG2,"d_dvdsub->id change: was %d is now %d\n",
6fc2e5d5f323 dvdnav api changed
jonas
parents: 6954
diff changeset
3414 d_dvdsub->id,stream_change->physical_wide);
6fc2e5d5f323 dvdnav api changed
jonas
parents: 6954
diff changeset
3415 // FIXME: need a better way to change SPU id
6fc2e5d5f323 dvdnav api changed
jonas
parents: 6954
diff changeset
3416 d_dvdsub->id=dvdsub_id=stream_change->physical_wide;
6fc2e5d5f323 dvdnav api changed
jonas
parents: 6954
diff changeset
3417 if (vo_spudec) spudec_reset(vo_spudec);
6fc2e5d5f323 dvdnav api changed
jonas
parents: 6954
diff changeset
3418 }
6fc2e5d5f323 dvdnav api changed
jonas
parents: 6954
diff changeset
3419 #else
6fc2e5d5f323 dvdnav api changed
jonas
parents: 6954
diff changeset
3420 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
3421
13577
606d90e03a2f printf --> mp_msg conversion
diego
parents: 13502
diff changeset
3422 mp_msg(MSGT_FIXME, MSGL_FIXME, MSGTR_DvdnavNavSpuStreamChange,
5489
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
3423 stream_change->physical,
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
3424 stream_change->logical);
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
3425
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
3426 if (vo_spudec && dvdsub_id!=stream_change->physical) {
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
3427 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
3428 d_dvdsub->id,stream_change->physical);
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
3429 // 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
3430 d_dvdsub->id=dvdsub_id=stream_change->physical;
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
3431 if (vo_spudec) spudec_reset(vo_spudec);
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
3432 }
6971
6fc2e5d5f323 dvdnav api changed
jonas
parents: 6954
diff changeset
3433 #endif
5489
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
3434 break;
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 case DVDNAV_AUDIO_STREAM_CHANGE: {
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
3437 int aid_temp;
6971
6fc2e5d5f323 dvdnav api changed
jonas
parents: 6954
diff changeset
3438 #if DVDNAVVERSION > 012
6fc2e5d5f323 dvdnav api changed
jonas
parents: 6954
diff changeset
3439 dvdnav_audio_stream_change_event_t *stream_change = (dvdnav_audio_stream_change_event_t*)(dvdnav_event->details);
6fc2e5d5f323 dvdnav api changed
jonas
parents: 6954
diff changeset
3440 #else
5489
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
3441 dvdnav_stream_change_event_t *stream_change = (dvdnav_stream_change_event_t*)(dvdnav_event->details);
6971
6fc2e5d5f323 dvdnav api changed
jonas
parents: 6954
diff changeset
3442 #endif
5489
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
3443
13577
606d90e03a2f printf --> mp_msg conversion
diego
parents: 13502
diff changeset
3444 mp_msg(MSGT_FIXME, MSGL_FIXME, MSGTR_DvdnavNavAudioStreamChange,
5489
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
3445 stream_change->physical,
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
3446 stream_change->logical);
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
3447
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
3448 aid_temp=stream_change->physical;
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
3449 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
3450 if (d_audio && audio_id!=aid_temp) {
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
3451 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
3452 d_audio->id,aid_temp);
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
3453 // 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
3454 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
3455 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
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 break;
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
3459 }
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
3460 case DVDNAV_VTS_CHANGE: {
13577
606d90e03a2f printf --> mp_msg conversion
diego
parents: 13502
diff changeset
3461 mp_msg(MSGT_FIXME, MSGL_FIXME, MSGTR_DvdnavNavVTSChange);
5489
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
3462 break;
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
3463 }
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
3464 case DVDNAV_CELL_CHANGE: {
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
3465 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
3466 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
3467
13577
606d90e03a2f printf --> mp_msg conversion
diego
parents: 13502
diff changeset
3468 mp_msg(MSGT_FIXME, MSGL_FIXME, MSGTR_DvdnavNavCellChange);
5489
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
3469 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
3470 /*
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
3471 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
3472 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
3473 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
3474 cell_playback->playback_time.hour,
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
3475 cell_playback->playback_time.minute,
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
3476 cell_playback->playback_time.second,
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
3477 cell_playback->playback_time.frame_u);
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
3478
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
3479 */
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
3480 //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
3481 //abs_seek_pos=0;
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
3482 break;
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
3483 }
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
3484 case DVDNAV_NAV_PACKET: {
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
3485 // printf("DVDNAV Event: Nav Packet\n");
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
3486 break;
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
3487 }
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
3488 case DVDNAV_SPU_CLUT_CHANGE: {
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
3489 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
3490
13577
606d90e03a2f printf --> mp_msg conversion
diego
parents: 13502
diff changeset
3491 mp_msg(MSGT_FIXME, MSGL_FIXME, MSGTR_DvdnavNavSpuClutChange);
5489
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
3492 // send new palette to SPU decoder
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
3493 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
3494
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
3495 break;
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
3496 }
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
3497 case DVDNAV_SEEK_DONE: {
13577
606d90e03a2f printf --> mp_msg conversion
diego
parents: 13502
diff changeset
3498 mp_msg(MSGT_FIXME, MSGL_FIXME, MSGTR_DvdnavNavSeekDone);
5489
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
3499 break;
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
3500 }
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
3501 }
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
3502
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
3503 // free the dvdnav event
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
3504 free(dvdnav_event->details);
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
3505 free(dvdnav_event);
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
3506 cmd->args[0].v.v=NULL;
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
3507 }
5380
8a01cde9cf39 DVDnav support patch by David Holm and Kees Cook <mplayer@outflux.net>
arpi
parents: 5367
diff changeset
3508 case MP_CMD_DVDNAV: {
5489
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
3509 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
3510
5627
a05efac12472 dvdnav hotfix
arpi
parents: 5621
diff changeset
3511 /* ignore these events if we're not in dvd_nav mode */
9752
3db72324a0fe Stream cleanup, don't use blah_on options anymore.
albeu
parents: 9695
diff changeset
3512 if (stream->type != STREAMTYPE_DVDNAV) break;
5627
a05efac12472 dvdnav hotfix
arpi
parents: 5621
diff changeset
3513
5380
8a01cde9cf39 DVDnav support patch by David Holm and Kees Cook <mplayer@outflux.net>
arpi
parents: 5367
diff changeset
3514 switch (cmd->args[0].v.i) {
8a01cde9cf39 DVDnav support patch by David Holm and Kees Cook <mplayer@outflux.net>
arpi
parents: 5367
diff changeset
3515 case MP_CMD_DVDNAV_UP:
5489
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
3516 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
3517 break;
8a01cde9cf39 DVDnav support patch by David Holm and Kees Cook <mplayer@outflux.net>
arpi
parents: 5367
diff changeset
3518 case MP_CMD_DVDNAV_DOWN:
5489
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
3519 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
3520 break;
8a01cde9cf39 DVDnav support patch by David Holm and Kees Cook <mplayer@outflux.net>
arpi
parents: 5367
diff changeset
3521 case MP_CMD_DVDNAV_LEFT:
5489
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
3522 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
3523 break;
8a01cde9cf39 DVDnav support patch by David Holm and Kees Cook <mplayer@outflux.net>
arpi
parents: 5367
diff changeset
3524 case MP_CMD_DVDNAV_RIGHT:
5489
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
3525 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
3526 break;
8a01cde9cf39 DVDnav support patch by David Holm and Kees Cook <mplayer@outflux.net>
arpi
parents: 5367
diff changeset
3527 case MP_CMD_DVDNAV_MENU:
13577
606d90e03a2f printf --> mp_msg conversion
diego
parents: 13502
diff changeset
3528 mp_msg(MSGT_FIXME, MSGL_FIXME, MSGTR_MenuCall);
5489
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
3529 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
3530 break;
8a01cde9cf39 DVDnav support patch by David Holm and Kees Cook <mplayer@outflux.net>
arpi
parents: 5367
diff changeset
3531 case MP_CMD_DVDNAV_SELECT:
5489
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
3532 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
3533 break;
8a01cde9cf39 DVDnav support patch by David Holm and Kees Cook <mplayer@outflux.net>
arpi
parents: 5367
diff changeset
3534 default:
8a01cde9cf39 DVDnav support patch by David Holm and Kees Cook <mplayer@outflux.net>
arpi
parents: 5367
diff changeset
3535 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
3536 break;
8a01cde9cf39 DVDnav support patch by David Holm and Kees Cook <mplayer@outflux.net>
arpi
parents: 5367
diff changeset
3537 }
8a01cde9cf39 DVDnav support patch by David Holm and Kees Cook <mplayer@outflux.net>
arpi
parents: 5367
diff changeset
3538 break;
8a01cde9cf39 DVDnav support patch by David Holm and Kees Cook <mplayer@outflux.net>
arpi
parents: 5367
diff changeset
3539 }
8a01cde9cf39 DVDnav support patch by David Holm and Kees Cook <mplayer@outflux.net>
arpi
parents: 5367
diff changeset
3540 #endif
4858
65730cea02e7 add half new input support for gui
pontscho
parents: 4856
diff changeset
3541 default : {
65730cea02e7 add half new input support for gui
pontscho
parents: 4856
diff changeset
3542 #ifdef HAVE_NEW_GUI
65730cea02e7 add half new input support for gui
pontscho
parents: 4856
diff changeset
3543 if ( ( use_gui )&&( cmd->id > MP_CMD_GUI_EVENTS ) ) guiGetEvent( guiIEvent,(char *)cmd->id );
65730cea02e7 add half new input support for gui
pontscho
parents: 4856
diff changeset
3544 else
65730cea02e7 add half new input support for gui
pontscho
parents: 4856
diff changeset
3545 #endif
10397
6180d7558f75 output typo fixes: unknow --> unknown
diego
parents: 10341
diff changeset
3546 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
3547 }
4858
65730cea02e7 add half new input support for gui
pontscho
parents: 4856
diff changeset
3548 }
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
3549 mp_cmd_free(cmd);
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
3550 }
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
3551 }
7111
b65b78640d49 removed old input code
alex
parents: 7068
diff changeset
3552
651
617ae66624b3 -ss patch by Loring Holden
arpi_esp
parents: 645
diff changeset
3553 if (seek_to_sec) {
937
a8a34da9c17f when using -ss:
laaz
parents: 933
diff changeset
3554 int a,b; float d;
a8a34da9c17f when using -ss:
laaz
parents: 933
diff changeset
3555
a8a34da9c17f when using -ss:
laaz
parents: 933
diff changeset
3556 if (sscanf(seek_to_sec, "%d:%d:%f", &a,&b,&d)==3)
a8a34da9c17f when using -ss:
laaz
parents: 933
diff changeset
3557 rel_seek_secs += 3600*a +60*b +d ;
a8a34da9c17f when using -ss:
laaz
parents: 933
diff changeset
3558 else if (sscanf(seek_to_sec, "%d:%f", &a, &d)==2)
a8a34da9c17f when using -ss:
laaz
parents: 933
diff changeset
3559 rel_seek_secs += 60*a +d;
a8a34da9c17f when using -ss:
laaz
parents: 933
diff changeset
3560 else if (sscanf(seek_to_sec, "%f", &d)==1)
a8a34da9c17f when using -ss:
laaz
parents: 933
diff changeset
3561 rel_seek_secs += d;
a8a34da9c17f when using -ss:
laaz
parents: 933
diff changeset
3562
a8a34da9c17f when using -ss:
laaz
parents: 933
diff changeset
3563 seek_to_sec = NULL;
651
617ae66624b3 -ss patch by Loring Holden
arpi_esp
parents: 645
diff changeset
3564 }
937
a8a34da9c17f when using -ss:
laaz
parents: 933
diff changeset
3565
2365
93616490c0dd -loop patch by Pascal Haakmat <a.haakmat@chello.nl>
arpi
parents: 2353
diff changeset
3566 /* Looping. */
3540
1bfa5284f160 -loop fixed
arpi
parents: 3532
diff changeset
3567 if(eof==1 && loop_times>=0) {
5655
117f34bb7097 Add correct loop option parsing in command line parser.
albeu
parents: 5651
diff changeset
3568 int l = loop_times;
117f34bb7097 Add correct loop option parsing in command line parser.
albeu
parents: 5651
diff changeset
3569 play_tree_iter_step(playtree_iter,0,0);
117f34bb7097 Add correct loop option parsing in command line parser.
albeu
parents: 5651
diff changeset
3570 loop_times = l;
3540
1bfa5284f160 -loop fixed
arpi
parents: 3532
diff changeset
3571 mp_msg(MSGT_CPLAYER,MSGL_V,"loop_times = %d, eof = %d\n", loop_times,eof);
2365
93616490c0dd -loop patch by Pascal Haakmat <a.haakmat@chello.nl>
arpi
parents: 2353
diff changeset
3572
3540
1bfa5284f160 -loop fixed
arpi
parents: 3532
diff changeset
3573 if(loop_times>1) loop_times--; else
1bfa5284f160 -loop fixed
arpi
parents: 3532
diff changeset
3574 if(loop_times==1) loop_times=-1;
8198
1935017c0f71 Experimantal OSD menu
albeu
parents: 8164
diff changeset
3575 play_n_frames=play_n_frames_mf;
2365
93616490c0dd -loop patch by Pascal Haakmat <a.haakmat@chello.nl>
arpi
parents: 2353
diff changeset
3576 eof=0;
3540
1bfa5284f160 -loop fixed
arpi
parents: 3532
diff changeset
3577 abs_seek_pos=3; rel_seek_secs=0; // seek to start of movie (0%)
8784
6e190ea2abba don't show OSD progbar when -loop seeks back
arpi
parents: 8745
diff changeset
3578 loop_seek = 1;
2365
93616490c0dd -loop patch by Pascal Haakmat <a.haakmat@chello.nl>
arpi
parents: 2353
diff changeset
3579 }
93616490c0dd -loop patch by Pascal Haakmat <a.haakmat@chello.nl>
arpi
parents: 2353
diff changeset
3580
1627
eeaee1632340 absolute seek debugging with 1-8 keys (disabled by default)
arpi
parents: 1626
diff changeset
3581 if(rel_seek_secs || abs_seek_pos){
1466
7845f6d7c4ba format-specific seeking code moved to demuxer_ stuff
arpi
parents: 1462
diff changeset
3582 current_module="seek";
1627
eeaee1632340 absolute seek debugging with 1-8 keys (disabled by default)
arpi
parents: 1626
diff changeset
3583 if(demux_seek(demuxer,rel_seek_secs,abs_seek_pos)){
1405
8ecf18884ad8 seeking code moved out from mplayer.c -> seek.c
arpi
parents: 1402
diff changeset
3584 // success:
4079
ae78dd1d8daf Add vobsub support.
kmkaplan
parents: 4064
diff changeset
3585 /* FIXME there should be real seeking for vobsub */
8966
arpi
parents: 8965
diff changeset
3586 if(sh_video) sh_video->pts=d_video->pts;
4079
ae78dd1d8daf Add vobsub support.
kmkaplan
parents: 4064
diff changeset
3587 if (vo_vobsub)
11589
5cff0d11b47b vobsub seeking support by Lu Ran
alex
parents: 11584
diff changeset
3588 //vobsub_reset(vo_vobsub);
5cff0d11b47b vobsub seeking support by Lu Ran
alex
parents: 11584
diff changeset
3589 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
3590 #if 0
5836
dcb0a2bf3345 Fix osd progress bar.
albeu
parents: 5830
diff changeset
3591 if(sh_video && d_video->packs == 0)
dcb0a2bf3345 Fix osd progress bar.
albeu
parents: 5830
diff changeset
3592 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
3593 if(sh_audio){
5836
dcb0a2bf3345 Fix osd progress bar.
albeu
parents: 5830
diff changeset
3594 if(d_audio->packs == 0)
dcb0a2bf3345 Fix osd progress bar.
albeu
parents: 5830
diff changeset
3595 ds_fill_buffer(d_audio);
8027
b9da278e4c92 verbose can be negative
arpi
parents: 8023
diff changeset
3596 if(verbose>0){
1459
622c504f36ef printf stuff moved seek.c->mplayer.c, resetting drop_frame_cnt after seek
arpi
parents: 1457
diff changeset
3597 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
3598 a_pts+=(ds_tell_pts(d_audio)-sh_audio->a_in_buffer_len)/(float)sh_audio->i_bps;
1567
5c7760aa4f94 printf->mp_msg/mp_dbg
arpi
parents: 1564
diff changeset
3599 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
3600 }
1567
5c7760aa4f94 printf->mp_msg/mp_dbg
arpi
parents: 1564
diff changeset
3601 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
3602 } else {
1567
5c7760aa4f94 printf->mp_msg/mp_dbg
arpi
parents: 1564
diff changeset
3603 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
3604 }
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
3605 #endif
1459
622c504f36ef printf stuff moved seek.c->mplayer.c, resetting drop_frame_cnt after seek
arpi
parents: 1457
diff changeset
3606 fflush(stdout);
622c504f36ef printf stuff moved seek.c->mplayer.c, resetting drop_frame_cnt after seek
arpi
parents: 1457
diff changeset
3607
4593
3769ccb8da8b libvo's query_ stuff replaced by new control() - patch by David Holm
arpi
parents: 4587
diff changeset
3608 if(sh_video){
3769ccb8da8b libvo's query_ stuff replaced by new control() - patch by David Holm
arpi
parents: 4587
diff changeset
3609 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
3610 resync_video_stream(sh_video);
5511
7a24a067f0af vo_config_count now counts calls to vo->config()
arpi
parents: 5507
diff changeset
3611 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
3612 }
3769ccb8da8b libvo's query_ stuff replaced by new control() - patch by David Holm
arpi
parents: 4587
diff changeset
3613
1459
622c504f36ef printf stuff moved seek.c->mplayer.c, resetting drop_frame_cnt after seek
arpi
parents: 1457
diff changeset
3614 if(sh_audio){
1466
7845f6d7c4ba format-specific seeking code moved to demuxer_ stuff
arpi
parents: 1462
diff changeset
3615 current_module="seek_audio_reset";
1334
061cabfbc07b some more cleanup
arpi
parents: 1331
diff changeset
3616 audio_out->reset(); // stop audio, throwing away buffered data
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
3617 }
1422
d02e0dcaf077 libvo2 support
arpi
parents: 1421
diff changeset
3618 #ifdef USE_OSD
1334
061cabfbc07b some more cleanup
arpi
parents: 1331
diff changeset
3619 // Set OSD:
8784
6e190ea2abba don't show OSD progbar when -loop seeks back
arpi
parents: 8745
diff changeset
3620 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
3621 #ifdef USE_EDL
1aa2c9b460af Merged EDL 0.5 patch - it's something like Quicktime's edit lists.
arpi
parents: 8494
diff changeset
3622 if( !edl_decision ) {
1aa2c9b460af Merged EDL 0.5 patch - it's something like Quicktime's edit lists.
arpi
parents: 8494
diff changeset
3623 #else
1aa2c9b460af Merged EDL 0.5 patch - it's something like Quicktime's edit lists.
arpi
parents: 8494
diff changeset
3624 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
3625 #endif
1aa2c9b460af Merged EDL 0.5 patch - it's something like Quicktime's edit lists.
arpi
parents: 8494
diff changeset
3626 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
3627 if (len>0 && sh_video){
1aa2c9b460af Merged EDL 0.5 patch - it's something like Quicktime's edit lists.
arpi
parents: 8494
diff changeset
3628 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
3629 vo_osd_progbar_type=0;
1aa2c9b460af Merged EDL 0.5 patch - it's something like Quicktime's edit lists.
arpi
parents: 8494
diff changeset
3630 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
3631 vo_osd_changed(OSDTYPE_PROGBAR);
1aa2c9b460af Merged EDL 0.5 patch - it's something like Quicktime's edit lists.
arpi
parents: 8494
diff changeset
3632 }
1727
9da2b587b029 changes according to OSD calculations
atlka
parents: 1726
diff changeset
3633 }
1334
061cabfbc07b some more cleanup
arpi
parents: 1331
diff changeset
3634 }
1422
d02e0dcaf077 libvo2 support
arpi
parents: 1421
diff changeset
3635 #endif
4587
886bf5274992 Audio only support. Include a fix in the asf demuxer opening.
albeu
parents: 4552
diff changeset
3636 if(sh_video) {
886bf5274992 Audio only support. Include a fix in the asf demuxer opening.
albeu
parents: 4552
diff changeset
3637 c_total=0;
886bf5274992 Audio only support. Include a fix in the asf demuxer opening.
albeu
parents: 4552
diff changeset
3638 max_pts_correction=0.1;
886bf5274992 Audio only support. Include a fix in the asf demuxer opening.
albeu
parents: 4552
diff changeset
3639 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
3640 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
3641 drop_frame_cnt=0;
886bf5274992 Audio only support. Include a fix in the asf demuxer opening.
albeu
parents: 4552
diff changeset
3642 too_slow_frame_cnt=0;
886bf5274992 Audio only support. Include a fix in the asf demuxer opening.
albeu
parents: 4552
diff changeset
3643 too_fast_frame_cnt=0;
3744
d358f4a74690 dvd seeking -> subtitle disappearing bugs fixed
arpi
parents: 3742
diff changeset
3644
5488
3f183ca22747 fixed SPU pts, it's 1024/90000 based instead of 1/100
arpi
parents: 5463
diff changeset
3645 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
3646 }
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
3647 }
8531
1aa2c9b460af Merged EDL 0.5 patch - it's something like Quicktime's edit lists.
arpi
parents: 8494
diff changeset
3648 #ifdef USE_EDL
13168
ce046ef860da EDL enhancement/fixes:
rtognimp
parents: 13132
diff changeset
3649 /*
13358
567875b88aab Hardcoded EDL messages moved to help_mp-en.h, Doxygen comments added, patch
diego
parents: 13353
diff changeset
3650 * 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
3651 * and find the next EDL action to take care of.
13168
ce046ef860da EDL enhancement/fixes:
rtognimp
parents: 13132
diff changeset
3652 */
ce046ef860da EDL enhancement/fixes:
rtognimp
parents: 13132
diff changeset
3653
ce046ef860da EDL enhancement/fixes:
rtognimp
parents: 13132
diff changeset
3654 next_edl_record = edl_records;
ce046ef860da EDL enhancement/fixes:
rtognimp
parents: 13132
diff changeset
3655
ce046ef860da EDL enhancement/fixes:
rtognimp
parents: 13132
diff changeset
3656 while (next_edl_record)
ce046ef860da EDL enhancement/fixes:
rtognimp
parents: 13132
diff changeset
3657 {
13358
567875b88aab Hardcoded EDL messages moved to help_mp-en.h, Doxygen comments added, patch
diego
parents: 13353
diff changeset
3658 /* 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
3659 * prior EDL implementation lacks this.
13168
ce046ef860da EDL enhancement/fixes:
rtognimp
parents: 13132
diff changeset
3660 */
ce046ef860da EDL enhancement/fixes:
rtognimp
parents: 13132
diff changeset
3661
ce046ef860da EDL enhancement/fixes:
rtognimp
parents: 13132
diff changeset
3662 if (next_edl_record->start_sec >= sh_video->pts)
ce046ef860da EDL enhancement/fixes:
rtognimp
parents: 13132
diff changeset
3663 {
ce046ef860da EDL enhancement/fixes:
rtognimp
parents: 13132
diff changeset
3664 if (edl_mute_count > 0)
ce046ef860da EDL enhancement/fixes:
rtognimp
parents: 13132
diff changeset
3665 {
ce046ef860da EDL enhancement/fixes:
rtognimp
parents: 13132
diff changeset
3666 if ((edl_mute_count % 2) == 0 &&
ce046ef860da EDL enhancement/fixes:
rtognimp
parents: 13132
diff changeset
3667 next_edl_record->mute_state == EDL_MUTE_END)
ce046ef860da EDL enhancement/fixes:
rtognimp
parents: 13132
diff changeset
3668 {
ce046ef860da EDL enhancement/fixes:
rtognimp
parents: 13132
diff changeset
3669 mixer_mute(&mixer);
ce046ef860da EDL enhancement/fixes:
rtognimp
parents: 13132
diff changeset
3670 edl_mute_count++;
ce046ef860da EDL enhancement/fixes:
rtognimp
parents: 13132
diff changeset
3671 }
ce046ef860da EDL enhancement/fixes:
rtognimp
parents: 13132
diff changeset
3672 if ((edl_mute_count % 2) != 0 &&
ce046ef860da EDL enhancement/fixes:
rtognimp
parents: 13132
diff changeset
3673 next_edl_record->mute_state == EDL_MUTE_START)
ce046ef860da EDL enhancement/fixes:
rtognimp
parents: 13132
diff changeset
3674 {
ce046ef860da EDL enhancement/fixes:
rtognimp
parents: 13132
diff changeset
3675 mixer_mute(&mixer);
ce046ef860da EDL enhancement/fixes:
rtognimp
parents: 13132
diff changeset
3676 edl_mute_count++;
ce046ef860da EDL enhancement/fixes:
rtognimp
parents: 13132
diff changeset
3677 }
ce046ef860da EDL enhancement/fixes:
rtognimp
parents: 13132
diff changeset
3678 } else if (next_edl_record->mute_state == EDL_MUTE_END)
ce046ef860da EDL enhancement/fixes:
rtognimp
parents: 13132
diff changeset
3679 {
ce046ef860da EDL enhancement/fixes:
rtognimp
parents: 13132
diff changeset
3680 mixer_mute(&mixer);
ce046ef860da EDL enhancement/fixes:
rtognimp
parents: 13132
diff changeset
3681 edl_mute_count++;
ce046ef860da EDL enhancement/fixes:
rtognimp
parents: 13132
diff changeset
3682 }
ce046ef860da EDL enhancement/fixes:
rtognimp
parents: 13132
diff changeset
3683 break;
ce046ef860da EDL enhancement/fixes:
rtognimp
parents: 13132
diff changeset
3684 }
ce046ef860da EDL enhancement/fixes:
rtognimp
parents: 13132
diff changeset
3685
ce046ef860da EDL enhancement/fixes:
rtognimp
parents: 13132
diff changeset
3686 next_edl_record = next_edl_record->next;
ce046ef860da EDL enhancement/fixes:
rtognimp
parents: 13132
diff changeset
3687
ce046ef860da EDL enhancement/fixes:
rtognimp
parents: 13132
diff changeset
3688 if (!next_edl_record && (edl_mute_count % 2) != 0
ce046ef860da EDL enhancement/fixes:
rtognimp
parents: 13132
diff changeset
3689 && edl_mute_count > 0)
ce046ef860da EDL enhancement/fixes:
rtognimp
parents: 13132
diff changeset
3690 {
ce046ef860da EDL enhancement/fixes:
rtognimp
parents: 13132
diff changeset
3691 mixer_mute(&mixer);
ce046ef860da EDL enhancement/fixes:
rtognimp
parents: 13132
diff changeset
3692 edl_mute_count++;
ce046ef860da EDL enhancement/fixes:
rtognimp
parents: 13132
diff changeset
3693 }
ce046ef860da EDL enhancement/fixes:
rtognimp
parents: 13132
diff changeset
3694 }
8531
1aa2c9b460af Merged EDL 0.5 patch - it's something like Quicktime's edit lists.
arpi
parents: 8494
diff changeset
3695 #endif
1405
8ecf18884ad8 seeking code moved out from mplayer.c -> seek.c
arpi
parents: 1402
diff changeset
3696 rel_seek_secs=0;
1627
eeaee1632340 absolute seek debugging with 1-8 keys (disabled by default)
arpi
parents: 1626
diff changeset
3697 abs_seek_pos=0;
5929
9e7d54e7be58 - frame_time delayed one frame, as it's really duration of current frame,
arpi
parents: 5927
diff changeset
3698 frame_time_remaining=0;
1466
7845f6d7c4ba format-specific seeking code moved to demuxer_ stuff
arpi
parents: 1462
diff changeset
3699 current_module=NULL;
8784
6e190ea2abba don't show OSD progbar when -loop seeks back
arpi
parents: 8745
diff changeset
3700 loop_seek=0;
1466
7845f6d7c4ba format-specific seeking code moved to demuxer_ stuff
arpi
parents: 1462
diff changeset
3701 }
7845f6d7c4ba format-specific seeking code moved to demuxer_ stuff
arpi
parents: 1462
diff changeset
3702
1723
5e4214a7540e GUI stuff. now seeking works, and xmga renders to video window
arpi
parents: 1709
diff changeset
3703 #ifdef HAVE_NEW_GUI
5e4214a7540e GUI stuff. now seeking works, and xmga renders to video window
arpi
parents: 1709
diff changeset
3704 if(use_gui){
5789
0132c5747e8a fix audio only files play
pontscho
parents: 5698
diff changeset
3705 guiEventHandling();
7751
27c9c440536f - dvd aspect changing bug - fixed
pontscho
parents: 7749
diff changeset
3706 if(demuxer->file_format==DEMUXER_TYPE_AVI && sh_video && sh_video->video.dwLength>2){
1735
bdc1ec6fe668 gui seekbar position fixed
arpi
parents: 1730
diff changeset
3707 // 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
3708 guiIntfStruct.Position=(float)d_video->pack_no*100.0f/sh_video->video.dwLength;
1735
bdc1ec6fe668 gui seekbar position fixed
arpi
parents: 1730
diff changeset
3709 } else {
6914
d882c7063e6d gui seekbar pos calc overflow fixed
arpi
parents: 6912
diff changeset
3710 off_t len = ( demuxer->movi_end - demuxer->movi_start );
d882c7063e6d gui seekbar pos calc overflow fixed
arpi
parents: 6912
diff changeset
3711 off_t pos = ( demuxer->file_format == DEMUXER_TYPE_AUDIO?stream->pos:demuxer->filepos );
d882c7063e6d gui seekbar pos calc overflow fixed
arpi
parents: 6912
diff changeset
3712 guiIntfStruct.Position=(len <= 0? 0.0f : ( pos - demuxer->movi_start ) * 100.0f / len );
1735
bdc1ec6fe668 gui seekbar position fixed
arpi
parents: 1730
diff changeset
3713 }
8966
arpi
parents: 8965
diff changeset
3714 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
3715 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
3716 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
3717 guiGetEvent( guiReDraw,NULL );
6903
c2d4100c964e - fix mixer handling
pontscho
parents: 6888
diff changeset
3718 guiGetEvent( guiSetVolume,NULL );
4818
3473ca9ef158 new gui interface, and gtk moved into mplayer process. fork ... bleh :)
pontscho
parents: 4807
diff changeset
3719 if(guiIntfStruct.Playing==0) break; // STOP
3473ca9ef158 new gui interface, and gtk moved into mplayer process. fork ... bleh :)
pontscho
parents: 4807
diff changeset
3720 if(guiIntfStruct.Playing==2) osd_function=OSD_PAUSE;
8423
c6a1a5b6ba25 - fix three submenu bug
pontscho
parents: 8366
diff changeset
3721 if ( guiIntfStruct.DiskChanged || guiIntfStruct.NewPlay ) goto goto_next_file;
3054
9507f90d8254 add half dvd support for gui
pontscho
parents: 3050
diff changeset
3722 #ifdef USE_DVDREAD
9507f90d8254 add half dvd support for gui
pontscho
parents: 3050
diff changeset
3723 if ( stream->type == STREAMTYPE_DVD )
9507f90d8254 add half dvd support for gui
pontscho
parents: 3050
diff changeset
3724 {
9507f90d8254 add half dvd support for gui
pontscho
parents: 3050
diff changeset
3725 dvd_priv_t * dvdp = stream->priv;
7854
d6c29d863f15 dvd chapter detect function from Gregory Kovriga
pontscho
parents: 7805
diff changeset
3726 guiIntfStruct.DVD.current_chapter=dvd_chapter_from_cell(dvdp,guiIntfStruct.DVD.current_title-1, dvdp->cur_cell)+1;
3054
9507f90d8254 add half dvd support for gui
pontscho
parents: 3050
diff changeset
3727 }
9507f90d8254 add half dvd support for gui
pontscho
parents: 3050
diff changeset
3728 #endif
1723
5e4214a7540e GUI stuff. now seeking works, and xmga renders to video window
arpi
parents: 1709
diff changeset
3729 }
5e4214a7540e GUI stuff. now seeking works, and xmga renders to video window
arpi
parents: 1709
diff changeset
3730 #endif
5e4214a7540e GUI stuff. now seeking works, and xmga renders to video window
arpi
parents: 1709
diff changeset
3731
5e4214a7540e GUI stuff. now seeking works, and xmga renders to video window
arpi
parents: 1709
diff changeset
3732
220
5348fa1313fe OSD functionality improved
arpi_esp
parents: 215
diff changeset
3733 //================= Update OSD ====================
1422
d02e0dcaf077 libvo2 support
arpi
parents: 1421
diff changeset
3734 #ifdef USE_OSD
10596
14695e4f37fc "when I run "mplayer -slave <audiofile> " then, while playing, I send the
albeu
parents: 10594
diff changeset
3735 if(osd_level>=1 && sh_video){
8966
arpi
parents: 8965
diff changeset
3736 int pts=sh_video->pts;
8800
2485bc98772d fixed some possible overflow places
alex
parents: 8784
diff changeset
3737 char osd_text_tmp[64];
595
12922295d3a8 OSD fixes
arpi_esp
parents: 591
diff changeset
3738 if(pts==osd_last_pts-1) ++pts; else osd_last_pts=pts;
371
55f9067ad176 OSD fixes, patch by Kebert Martin
arpi_esp
parents: 363
diff changeset
3739 vo_osd_text=osd_text_buffer;
5489
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
3740 #ifdef USE_DVDNAV
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
3741 if (osd_show_dvd_nav_delay) {
8800
2485bc98772d fixed some possible overflow places
alex
parents: 8784
diff changeset
3742 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
3743 osd_show_dvd_nav_delay--;
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
3744 } else
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
3745 #endif
8627
14ab71b47a58 user friendly channel tuning + 10L fix in tvi_v4l (by Stephane Jourdois)
henry
parents: 8619
diff changeset
3746 #ifdef USE_TV
14ab71b47a58 user friendly channel tuning + 10L fix in tvi_v4l (by Stephane Jourdois)
henry
parents: 8619
diff changeset
3747 if (osd_show_tv_channel && tv_channel_list) {
8800
2485bc98772d fixed some possible overflow places
alex
parents: 8784
diff changeset
3748 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
3749 osd_show_tv_channel--;
14ab71b47a58 user friendly channel tuning + 10L fix in tvi_v4l (by Stephane Jourdois)
henry
parents: 8619
diff changeset
3750 } else
14ab71b47a58 user friendly channel tuning + 10L fix in tvi_v4l (by Stephane Jourdois)
henry
parents: 8619
diff changeset
3751 #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
3752 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
3753 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
3754 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
3755 } else
7628
d6608342591d This patch adds the functionality to disable/enable subtitles while playing
arpi
parents: 7621
diff changeset
3756 if (osd_show_sub_visibility) {
8800
2485bc98772d fixed some possible overflow places
alex
parents: 8784
diff changeset
3757 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
3758 osd_show_sub_visibility--;
d6608342591d This patch adds the functionality to disable/enable subtitles while playing
arpi
parents: 7621
diff changeset
3759 } else
7780
9806d65986e4 Mplayer can switch between subtitles of different languages during
kmkaplan
parents: 7751
diff changeset
3760 if (osd_show_vobsub_changed) {
13089
b9171604a4ac moved combined vobsub_lang into sub_select
joey
parents: 13010
diff changeset
3761 if (vo_vobsub && vobsub_id >= 0) {
b9171604a4ac moved combined vobsub_lang into sub_select
joey
parents: 13010
diff changeset
3762 const char *language = "none";
7780
9806d65986e4 Mplayer can switch between subtitles of different languages during
kmkaplan
parents: 7751
diff changeset
3763 language = vobsub_get_id(vo_vobsub, (unsigned int) vobsub_id);
8800
2485bc98772d fixed some possible overflow places
alex
parents: 8784
diff changeset
3764 snprintf(osd_text_tmp, 63, "Subtitles: (%d) %s", vobsub_id, language ? language : "unknown");
13089
b9171604a4ac moved combined vobsub_lang into sub_select
joey
parents: 13010
diff changeset
3765 }
13502
05f846322437 show ogg subtitle language on OSD, if available
joey
parents: 13501
diff changeset
3766 #ifdef HAVE_OGGVORBIS
13089
b9171604a4ac moved combined vobsub_lang into sub_select
joey
parents: 13010
diff changeset
3767 if (d_dvdsub && demuxer->type == DEMUXER_TYPE_OGG) {
b9171604a4ac moved combined vobsub_lang into sub_select
joey
parents: 13010
diff changeset
3768 if (dvdsub_id < 0)
b9171604a4ac moved combined vobsub_lang into sub_select
joey
parents: 13010
diff changeset
3769 snprintf(osd_text_tmp, 63, "Subtitles: (off)");
13502
05f846322437 show ogg subtitle language on OSD, if available
joey
parents: 13501
diff changeset
3770 else {
05f846322437 show ogg subtitle language on OSD, if available
joey
parents: 13501
diff changeset
3771 char *lang = demux_ogg_sub_lang(demuxer, dvdsub_id);
05f846322437 show ogg subtitle language on OSD, if available
joey
parents: 13501
diff changeset
3772 if (!lang) lang = "unknown";
05f846322437 show ogg subtitle language on OSD, if available
joey
parents: 13501
diff changeset
3773 snprintf(osd_text_tmp, 63, "Subtitles: (%d) %s", dvdsub_id, lang);
05f846322437 show ogg subtitle language on OSD, if available
joey
parents: 13501
diff changeset
3774 }
13089
b9171604a4ac moved combined vobsub_lang into sub_select
joey
parents: 13010
diff changeset
3775 }
13502
05f846322437 show ogg subtitle language on OSD, if available
joey
parents: 13501
diff changeset
3776 #endif
13116
16d248dc671c fix compilation withoud libdvdread
henry
parents: 13098
diff changeset
3777 #ifdef USE_DVDREAD
13129
cfce549da2f0 Display the language code for subtitles from Matroska files.
mosu
parents: 13127
diff changeset
3778 if (vo_spudec && (demuxer->type != DEMUXER_TYPE_MATROSKA)) {
13089
b9171604a4ac moved combined vobsub_lang into sub_select
joey
parents: 13010
diff changeset
3779 char lang[5] = "none";
b9171604a4ac moved combined vobsub_lang into sub_select
joey
parents: 13010
diff changeset
3780 int code = 0;
b9171604a4ac moved combined vobsub_lang into sub_select
joey
parents: 13010
diff changeset
3781 if (dvdsub_id >= 0) code = dvd_lang_from_sid(stream, dvdsub_id);
b9171604a4ac moved combined vobsub_lang into sub_select
joey
parents: 13010
diff changeset
3782 if (code) {
b9171604a4ac moved combined vobsub_lang into sub_select
joey
parents: 13010
diff changeset
3783 lang[0] = code >> 8;
b9171604a4ac moved combined vobsub_lang into sub_select
joey
parents: 13010
diff changeset
3784 lang[1] = code;
b9171604a4ac moved combined vobsub_lang into sub_select
joey
parents: 13010
diff changeset
3785 lang[2] = 0;
b9171604a4ac moved combined vobsub_lang into sub_select
joey
parents: 13010
diff changeset
3786 }
b9171604a4ac moved combined vobsub_lang into sub_select
joey
parents: 13010
diff changeset
3787 snprintf(osd_text_tmp, 63, "Subtitles: (%d) %s", dvdsub_id, lang);
b9171604a4ac moved combined vobsub_lang into sub_select
joey
parents: 13010
diff changeset
3788 }
13116
16d248dc671c fix compilation withoud libdvdread
henry
parents: 13098
diff changeset
3789 #endif
13129
cfce549da2f0 Display the language code for subtitles from Matroska files.
mosu
parents: 13127
diff changeset
3790 #ifdef HAVE_MATROSKA
cfce549da2f0 Display the language code for subtitles from Matroska files.
mosu
parents: 13127
diff changeset
3791 if (demuxer->type == DEMUXER_TYPE_MATROSKA) {
cfce549da2f0 Display the language code for subtitles from Matroska files.
mosu
parents: 13127
diff changeset
3792 char lang[10] = "unknown";
cfce549da2f0 Display the language code for subtitles from Matroska files.
mosu
parents: 13127
diff changeset
3793 if (dvdsub_id >= 0) {
cfce549da2f0 Display the language code for subtitles from Matroska files.
mosu
parents: 13127
diff changeset
3794 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
3795 lang[9] = 0;
cfce549da2f0 Display the language code for subtitles from Matroska files.
mosu
parents: 13127
diff changeset
3796 } else
cfce549da2f0 Display the language code for subtitles from Matroska files.
mosu
parents: 13127
diff changeset
3797 strcpy(lang, "off");
cfce549da2f0 Display the language code for subtitles from Matroska files.
mosu
parents: 13127
diff changeset
3798 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
3799 }
cfce549da2f0 Display the language code for subtitles from Matroska files.
mosu
parents: 13127
diff changeset
3800 #endif
7780
9806d65986e4 Mplayer can switch between subtitles of different languages during
kmkaplan
parents: 7751
diff changeset
3801 osd_show_vobsub_changed--;
9806d65986e4 Mplayer can switch between subtitles of different languages during
kmkaplan
parents: 7751
diff changeset
3802 } else
9870
09d630a4f991 support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents: 9831
diff changeset
3803 #ifdef USE_SUB
09d630a4f991 support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents: 9831
diff changeset
3804 if (osd_show_sub_changed) {
9875
6f36703cdd2a The person who checked in the previous patch accidentally put a declaration
rsf
parents: 9870
diff changeset
3805 char *tmp2;
9870
09d630a4f991 support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents: 9831
diff changeset
3806 tmp = subdata->filename;
10211
4bc481804519 warning fixes by Dominik Mierzejewski <dominik@rangers.eu.org>
alex
parents: 10167
diff changeset
3807 if ((tmp2 = strrchr(tmp, '/'))) {
9870
09d630a4f991 support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents: 9831
diff changeset
3808 tmp = tmp2+1;
09d630a4f991 support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents: 9831
diff changeset
3809 }
09d630a4f991 support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents: 9831
diff changeset
3810 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
3811 set_of_sub_pos + 1,
09d630a4f991 support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents: 9831
diff changeset
3812 strlen(tmp) < 20 ? "" : "...",
09d630a4f991 support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents: 9831
diff changeset
3813 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
3814 osd_show_sub_changed--;
09d630a4f991 support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents: 9831
diff changeset
3815 } else
09d630a4f991 support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents: 9831
diff changeset
3816 #endif
3234
d1e891c1e548 dusplay sub_delay patch by Evgeny Chukreev <codedj@echo.ru>
arpi
parents: 3201
diff changeset
3817 if (osd_show_sub_delay) {
8800
2485bc98772d fixed some possible overflow places
alex
parents: 8784
diff changeset
3818 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
3819 osd_show_sub_delay--;
d1e891c1e548 dusplay sub_delay patch by Evgeny Chukreev <codedj@echo.ru>
arpi
parents: 3201
diff changeset
3820 } else
8366
3e3b30d16719 With this patch the text 'Sub position: x/100' is displayed
arpi
parents: 8365
diff changeset
3821 if (osd_show_sub_pos) {
8800
2485bc98772d fixed some possible overflow places
alex
parents: 8784
diff changeset
3822 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
3823 osd_show_sub_pos--;
3e3b30d16719 With this patch the text 'Sub position: x/100' is displayed
arpi
parents: 8365
diff changeset
3824 } else
8534
922ce27eb683 This patch adds support for vertical subtitle alignment
arpi
parents: 8531
diff changeset
3825 if (osd_show_sub_alignment) {
8800
2485bc98772d fixed some possible overflow places
alex
parents: 8784
diff changeset
3826 snprintf(osd_text_tmp, 63, "Sub alignment: %s",
8534
922ce27eb683 This patch adds support for vertical subtitle alignment
arpi
parents: 8531
diff changeset
3827 (sub_alignment == 2 ? "bottom" :
922ce27eb683 This patch adds support for vertical subtitle alignment
arpi
parents: 8531
diff changeset
3828 (sub_alignment == 1 ? "center" : "top")));
922ce27eb683 This patch adds support for vertical subtitle alignment
arpi
parents: 8531
diff changeset
3829 osd_show_sub_alignment--;
922ce27eb683 This patch adds support for vertical subtitle alignment
arpi
parents: 8531
diff changeset
3830 } else
3783
de6b00131e95 show a-v delay in osd (based on subdelay osd patch)
arpi
parents: 3754
diff changeset
3831 if (osd_show_av_delay) {
8800
2485bc98772d fixed some possible overflow places
alex
parents: 8784
diff changeset
3832 snprintf(osd_text_tmp, 63, "A-V delay: %d ms", ROUND(audio_delay*1000));
3783
de6b00131e95 show a-v delay in osd (based on subdelay osd patch)
arpi
parents: 3754
diff changeset
3833 osd_show_av_delay--;
13710
d7af73cc38da allow changing playback speed during playback.
reimar
parents: 13684
diff changeset
3834 } else if (osd_show_speed) {
d7af73cc38da allow changing playback speed during playback.
reimar
parents: 13684
diff changeset
3835 snprintf(osd_text_tmp, 63, "Speed: x %6.2f", playback_speed);
d7af73cc38da allow changing playback speed during playback.
reimar
parents: 13684
diff changeset
3836 osd_show_speed--;
11542
85e503ddf65f runtime 'stay-on-top' functionality
joey
parents: 11352
diff changeset
3837 } else if (osd_show_ontop) {
85e503ddf65f runtime 'stay-on-top' functionality
joey
parents: 11352
diff changeset
3838 snprintf(osd_text_tmp, 63, "Stay on top: %sabled", vo_ontop?"en":"dis");
85e503ddf65f runtime 'stay-on-top' functionality
joey
parents: 11352
diff changeset
3839 osd_show_ontop--;
13091
25f51c72eb06 added runtime toggle of root window playback
joey
parents: 13089
diff changeset
3840 } else if (osd_show_rootwin) {
25f51c72eb06 added runtime toggle of root window playback
joey
parents: 13089
diff changeset
3841 snprintf(osd_text_tmp, 63, "Rootwin: %sabled", vo_rootwin?"en":"dis");
25f51c72eb06 added runtime toggle of root window playback
joey
parents: 13089
diff changeset
3842 osd_show_rootwin--;
11936
0fc4416a0173 Display Framedropping state on the OSD.
diego
parents: 11875
diff changeset
3843 } else if (osd_show_framedropping) {
0fc4416a0173 Display Framedropping state on the OSD.
diego
parents: 11875
diff changeset
3844 snprintf(osd_text_tmp, 63, "Framedropping: %s",
0fc4416a0173 Display Framedropping state on the OSD.
diego
parents: 11875
diff changeset
3845 (frame_dropping == 1 ? "on" :
0fc4416a0173 Display Framedropping state on the OSD.
diego
parents: 11875
diff changeset
3846 (frame_dropping == 2 ? "hard" : "off")));
0fc4416a0173 Display Framedropping state on the OSD.
diego
parents: 11875
diff changeset
3847 osd_show_framedropping--;
8612
a61d1b326beb It shows not just the progressbar, but progressbar /and/ percentage
arpi
parents: 8606
diff changeset
3848 } else if(osd_level>=2) {
a61d1b326beb It shows not just the progressbar, but progressbar /and/ percentage
arpi
parents: 8606
diff changeset
3849 int len = demuxer_get_time_length(demuxer);
a61d1b326beb It shows not just the progressbar, but progressbar /and/ percentage
arpi
parents: 8606
diff changeset
3850 int percentage = -1;
8800
2485bc98772d fixed some possible overflow places
alex
parents: 8784
diff changeset
3851 char percentage_text[10];
8612
a61d1b326beb It shows not just the progressbar, but progressbar /and/ percentage
arpi
parents: 8606
diff changeset
3852 if (osd_show_percentage) {
a61d1b326beb It shows not just the progressbar, but progressbar /and/ percentage
arpi
parents: 8606
diff changeset
3853 percentage = demuxer_get_percent_pos(demuxer);
a61d1b326beb It shows not just the progressbar, but progressbar /and/ percentage
arpi
parents: 8606
diff changeset
3854 osd_show_percentage--;
a61d1b326beb It shows not just the progressbar, but progressbar /and/ percentage
arpi
parents: 8606
diff changeset
3855 }
a61d1b326beb It shows not just the progressbar, but progressbar /and/ percentage
arpi
parents: 8606
diff changeset
3856 if (percentage >= 0)
8800
2485bc98772d fixed some possible overflow places
alex
parents: 8784
diff changeset
3857 snprintf(percentage_text, 9, " (%d%%)", percentage);
8619
544bb92b62e5 fixed 2 10l-s
alex
parents: 8614
diff changeset
3858 else
544bb92b62e5 fixed 2 10l-s
alex
parents: 8614
diff changeset
3859 percentage_text[0] = 0;
8612
a61d1b326beb It shows not just the progressbar, but progressbar /and/ percentage
arpi
parents: 8606
diff changeset
3860 if (osd_level == 3)
8800
2485bc98772d fixed some possible overflow places
alex
parents: 8784
diff changeset
3861 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
3862 else
8800
2485bc98772d fixed some possible overflow places
alex
parents: 8784
diff changeset
3863 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
3864 } else osd_text_tmp[0]=0;
4807
156482788caf osd outside movie support for vo_sdl, patch by Fredrik Kuivinen
atmos4
parents: 4798
diff changeset
3865
156482788caf osd outside movie support for vo_sdl, patch by Fredrik Kuivinen
atmos4
parents: 4798
diff changeset
3866 if(strcmp(vo_osd_text, osd_text_tmp)) {
8800
2485bc98772d fixed some possible overflow places
alex
parents: 8784
diff changeset
3867 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
3868 vo_osd_changed(OSDTYPE_OSD);
4807
156482788caf osd outside movie support for vo_sdl, patch by Fredrik Kuivinen
atmos4
parents: 4798
diff changeset
3869 }
371
55f9067ad176 OSD fixes, patch by Kebert Martin
arpi_esp
parents: 363
diff changeset
3870 } else {
4807
156482788caf osd outside movie support for vo_sdl, patch by Fredrik Kuivinen
atmos4
parents: 4798
diff changeset
3871 if(vo_osd_text) {
371
55f9067ad176 OSD fixes, patch by Kebert Martin
arpi_esp
parents: 363
diff changeset
3872 vo_osd_text=NULL;
5638
86663f1b9b00 new osd code, use osd objs to follow changes and do minimal updates
arpi
parents: 5627
diff changeset
3873 vo_osd_changed(OSDTYPE_OSD);
4807
156482788caf osd outside movie support for vo_sdl, patch by Fredrik Kuivinen
atmos4
parents: 4798
diff changeset
3874 }
371
55f9067ad176 OSD fixes, patch by Kebert Martin
arpi_esp
parents: 363
diff changeset
3875 }
220
5348fa1313fe OSD functionality improved
arpi_esp
parents: 215
diff changeset
3876 // for(i=1;i<=11;i++) osd_text_buffer[10+i]=i;osd_text_buffer[10+i]=0;
371
55f9067ad176 OSD fixes, patch by Kebert Martin
arpi_esp
parents: 363
diff changeset
3877 // vo_osd_text=osd_text_buffer;
1422
d02e0dcaf077 libvo2 support
arpi
parents: 1421
diff changeset
3878 #endif
458
49b0474b2e26 I really hope that you will learn how to use cvs, sooner or later...
arpi_esp
parents: 452
diff changeset
3879
1422
d02e0dcaf077 libvo2 support
arpi
parents: 1421
diff changeset
3880 #ifdef USE_SUB
258
66017e126280 subtitles (.sub files) support
arpi_esp
parents: 240
diff changeset
3881 // find sub
9870
09d630a4f991 support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents: 9831
diff changeset
3882 if(subdata && sh_video->pts>0){
8966
arpi
parents: 8965
diff changeset
3883 float pts=sh_video->pts;
398
f5918fc8df10 more cleanup of video decoding
arpi_esp
parents: 396
diff changeset
3884 if(sub_fps==0) sub_fps=sh_video->fps;
482
1a2c4f3e7a10 sub control optimized
arpi_esp
parents: 470
diff changeset
3885 current_module="find_sub";
3274
ac7ded58b6df mpeg subtitle flickering patch by Evgeny Chukreev <codedj@echo.ru>
arpi
parents: 3257
diff changeset
3886 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
3887 find_sub(subdata, (pts+sub_delay) *
09d630a4f991 support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents: 9831
diff changeset
3888 (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
3889 // FIXME! frame counter...
3274
ac7ded58b6df mpeg subtitle flickering patch by Evgeny Chukreev <codedj@echo.ru>
arpi
parents: 3257
diff changeset
3890 sub_last_pts = pts;
ac7ded58b6df mpeg subtitle flickering patch by Evgeny Chukreev <codedj@echo.ru>
arpi
parents: 3257
diff changeset
3891 }
482
1a2c4f3e7a10 sub control optimized
arpi_esp
parents: 470
diff changeset
3892 current_module=NULL;
258
66017e126280 subtitles (.sub files) support
arpi_esp
parents: 240
diff changeset
3893 }
1422
d02e0dcaf077 libvo2 support
arpi
parents: 1421
diff changeset
3894 #endif
9695
68c44d3530c8 Improved xscreensaver support.
ranma
parents: 9610
diff changeset
3895
9831
0397b461f0fb MINGW32 port and select()less fifocode by Arpi
faust3
parents: 9752
diff changeset
3896 #ifdef HAVE_X11
9695
68c44d3530c8 Improved xscreensaver support.
ranma
parents: 9610
diff changeset
3897 if (stop_xscreensaver && sh_video) {
68c44d3530c8 Improved xscreensaver support.
ranma
parents: 9610
diff changeset
3898 current_module="stop_xscreensaver";
11999
239623f1e8a1 Use system clock for xscreensaver pings
ranma
parents: 11977
diff changeset
3899 xscreensaver_heartbeat();
9695
68c44d3530c8 Improved xscreensaver support.
ranma
parents: 9610
diff changeset
3900 current_module=NULL;
68c44d3530c8 Improved xscreensaver support.
ranma
parents: 9610
diff changeset
3901 }
9831
0397b461f0fb MINGW32 port and select()less fifocode by Arpi
faust3
parents: 9752
diff changeset
3902 #endif
554
d8b3c80604e3 dvd sub parser move dto mplayer.c
arpi_esp
parents: 552
diff changeset
3903
6110
7bea806b9c5f Improvment for spu subtitles.
albeu
parents: 6082
diff changeset
3904 // DVD sub:
7bea806b9c5f Improvment for spu subtitles.
albeu
parents: 6082
diff changeset
3905 if(vo_config_count && vo_spudec) {
7bea806b9c5f Improvment for spu subtitles.
albeu
parents: 6082
diff changeset
3906 unsigned char* packet=NULL;
10240
alex
parents: 10225
diff changeset
3907 int len,timestamp;
10216
d608097901b1 changed the silly func-inside-func codepice
alex
parents: 10211
diff changeset
3908 current_module="spudec";
d608097901b1 changed the silly func-inside-func codepice
alex
parents: 10211
diff changeset
3909 spudec_heartbeat(vo_spudec,90000*sh_video->timer);
6110
7bea806b9c5f Improvment for spu subtitles.
albeu
parents: 6082
diff changeset
3910 // Get a sub packet from the dvd or a vobsub and make a timestamp relative to sh_video->timer
10240
alex
parents: 10225
diff changeset
3911 while(1) {
6110
7bea806b9c5f Improvment for spu subtitles.
albeu
parents: 6082
diff changeset
3912 // Vobsub
7bea806b9c5f Improvment for spu subtitles.
albeu
parents: 6082
diff changeset
3913 len = 0;
7bea806b9c5f Improvment for spu subtitles.
albeu
parents: 6082
diff changeset
3914 if(vo_vobsub) {
8966
arpi
parents: 8965
diff changeset
3915 if(sh_video->pts+sub_delay>=0) {
6110
7bea806b9c5f Improvment for spu subtitles.
albeu
parents: 6082
diff changeset
3916 // The + next_frame_time is there because we'll display the sub at the next frame
8966
arpi
parents: 8965
diff changeset
3917 len = vobsub_get_packet(vo_vobsub,sh_video->pts+sub_delay+next_frame_time,(void**)&packet,&timestamp);
6110
7bea806b9c5f Improvment for spu subtitles.
albeu
parents: 6082
diff changeset
3918 if(len > 0) {
8966
arpi
parents: 8965
diff changeset
3919 timestamp -= (sh_video->pts + sub_delay - sh_video->timer)*90000;
10718
alex
parents: 10708
diff changeset
3920 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
7bea806b9c5f Improvment for spu subtitles.
albeu
parents: 6082
diff changeset
3921 }
7bea806b9c5f Improvment for spu subtitles.
albeu
parents: 6082
diff changeset
3922 }
7bea806b9c5f Improvment for spu subtitles.
albeu
parents: 6082
diff changeset
3923 } else {
7bea806b9c5f Improvment for spu subtitles.
albeu
parents: 6082
diff changeset
3924 // DVD sub
7bea806b9c5f Improvment for spu subtitles.
albeu
parents: 6082
diff changeset
3925 len = ds_get_packet_sub(d_dvdsub,(unsigned char**)&packet);
7bea806b9c5f Improvment for spu subtitles.
albeu
parents: 6082
diff changeset
3926 if(len > 0) {
10691
665fd8af2db7 fabs needs math.h
ranma
parents: 10661
diff changeset
3927 float x = d_dvdsub->pts - sh_video->pts;
665fd8af2db7 fabs needs math.h
ranma
parents: 10661
diff changeset
3928 if (x < -10 || x > 10) // prevent missing subs on pts reset
10557
2bb2903dfb7e Prevent missing subtitles at pts reset.
ranma
parents: 10550
diff changeset
3929 timestamp = 90000*(sh_video->timer + d_dvdsub->pts + sub_delay - sh_video->pts);
2bb2903dfb7e Prevent missing subtitles at pts reset.
ranma
parents: 10550
diff changeset
3930 else timestamp = 90000*(sh_video->timer + sub_delay);
8966
arpi
parents: 8965
diff changeset
3931 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
7bea806b9c5f Improvment for spu subtitles.
albeu
parents: 6082
diff changeset
3932 }
7bea806b9c5f Improvment for spu subtitles.
albeu
parents: 6082
diff changeset
3933 }
10240
alex
parents: 10225
diff changeset
3934 if(len<=0 || !packet) break;
6204
1ba75212f7ef Little fix for vobsub/dvd subtitles
albeu
parents: 6190
diff changeset
3935 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
3936 else spudec_assemble(vo_spudec,packet,len,timestamp);
554
d8b3c80604e3 dvd sub parser move dto mplayer.c
arpi_esp
parents: 552
diff changeset
3937 }
d8b3c80604e3 dvd sub parser move dto mplayer.c
arpi_esp
parents: 552
diff changeset
3938
6190
bd6748605681 Bounding box and partial update patch for vob/dvdsub by Hephooey.
atmos4
parents: 6185
diff changeset
3939 /* 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
3940 if(spudec_changed(vo_spudec))
bd6748605681 Bounding box and partial update patch for vob/dvdsub by Hephooey.
atmos4
parents: 6185
diff changeset
3941 vo_osd_changed(OSDTYPE_SPU);
6110
7bea806b9c5f Improvment for spu subtitles.
albeu
parents: 6082
diff changeset
3942 current_module=NULL;
7bea806b9c5f Improvment for spu subtitles.
albeu
parents: 6082
diff changeset
3943 }
7bea806b9c5f Improvment for spu subtitles.
albeu
parents: 6082
diff changeset
3944
1421
ea0a0b9e6fbc nosound avi seeking fixed
arpi
parents: 1420
diff changeset
3945 } // while(!eof)
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
3946
1567
5c7760aa4f94 printf->mp_msg/mp_dbg
arpi
parents: 1564
diff changeset
3947 mp_msg(MSGT_GLOBAL,MSGL_V,"EOF code: %d \n",eof);
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
3948
1639
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
3949 }
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
3950
3618
772729dd7b40 better dvd support
pontscho
parents: 3597
diff changeset
3951 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
3952
6138
523014df7d32 big cosmetics patch, cleanup of messages printed by mplayer and libs.
arpi
parents: 6135
diff changeset
3953 mp_msg(MSGT_CPLAYER,MSGL_INFO,"\n");
523014df7d32 big cosmetics patch, cleanup of messages printed by mplayer and libs.
arpi
parents: 6135
diff changeset
3954
4221
401149ba73fd Fixed bug with benchmark option
albeu
parents: 4203
diff changeset
3955 if(benchmark){
401149ba73fd Fixed bug with benchmark option
albeu
parents: 4203
diff changeset
3956 double tot=video_time_usage+vout_time_usage+audio_time_usage;
401149ba73fd Fixed bug with benchmark option
albeu
parents: 4203
diff changeset
3957 double total_time_usage;
401149ba73fd Fixed bug with benchmark option
albeu
parents: 4203
diff changeset
3958 total_time_usage_start=GetTimer()-total_time_usage_start;
401149ba73fd Fixed bug with benchmark option
albeu
parents: 4203
diff changeset
3959 total_time_usage = (float)total_time_usage_start*0.000001;
5151
610d399f50c3 - cleanup pass 1. more to come soon...
arpi
parents: 5138
diff changeset
3960 mp_msg(MSGT_CPLAYER,MSGL_INFO,"\nBENCHMARKs: VC:%8.3fs VO:%8.3fs A:%8.3fs Sys:%8.3fs = %8.3fs\n",
4221
401149ba73fd Fixed bug with benchmark option
albeu
parents: 4203
diff changeset
3961 video_time_usage,vout_time_usage,audio_time_usage,
401149ba73fd Fixed bug with benchmark option
albeu
parents: 4203
diff changeset
3962 total_time_usage-tot,total_time_usage);
401149ba73fd Fixed bug with benchmark option
albeu
parents: 4203
diff changeset
3963 if(total_time_usage>0.0)
5151
610d399f50c3 - cleanup pass 1. more to come soon...
arpi
parents: 5138
diff changeset
3964 mp_msg(MSGT_CPLAYER,MSGL_INFO,"BENCHMARK%%: VC:%8.4f%% VO:%8.4f%% A:%8.4f%% Sys:%8.4f%% = %8.4f%%\n",
4221
401149ba73fd Fixed bug with benchmark option
albeu
parents: 4203
diff changeset
3965 100.0*video_time_usage/total_time_usage,
401149ba73fd Fixed bug with benchmark option
albeu
parents: 4203
diff changeset
3966 100.0*vout_time_usage/total_time_usage,
401149ba73fd Fixed bug with benchmark option
albeu
parents: 4203
diff changeset
3967 100.0*audio_time_usage/total_time_usage,
401149ba73fd Fixed bug with benchmark option
albeu
parents: 4203
diff changeset
3968 100.0*(total_time_usage-tot)/total_time_usage,
401149ba73fd Fixed bug with benchmark option
albeu
parents: 4203
diff changeset
3969 100.0);
5983
4d868c3c9fff some cleanup around uninit()
arpi
parents: 5955
diff changeset
3970 if(total_frame_cnt && frame_dropping)
5621
0426f9b887cd some more statistics: BENCHMARKn
arpi
parents: 5612
diff changeset
3971 mp_msg(MSGT_CPLAYER,MSGL_INFO,"BENCHMARKn: disp: %d (%3.2f fps) drop: %d (%d%%) total: %d (%3.2f fps)\n",
0426f9b887cd some more statistics: BENCHMARKn
arpi
parents: 5612
diff changeset
3972 total_frame_cnt-drop_frame_cnt,
0426f9b887cd some more statistics: BENCHMARKn
arpi
parents: 5612
diff changeset
3973 (total_time_usage>0.5)?((total_frame_cnt-drop_frame_cnt)/total_time_usage):0,
0426f9b887cd some more statistics: BENCHMARKn
arpi
parents: 5612
diff changeset
3974 drop_frame_cnt,
0426f9b887cd some more statistics: BENCHMARKn
arpi
parents: 5612
diff changeset
3975 100*drop_frame_cnt/total_frame_cnt,
0426f9b887cd some more statistics: BENCHMARKn
arpi
parents: 5612
diff changeset
3976 total_frame_cnt,
0426f9b887cd some more statistics: BENCHMARKn
arpi
parents: 5612
diff changeset
3977 (total_time_usage>0.5)?(total_frame_cnt/total_time_usage):0);
0426f9b887cd some more statistics: BENCHMARKn
arpi
parents: 5612
diff changeset
3978
4221
401149ba73fd Fixed bug with benchmark option
albeu
parents: 4203
diff changeset
3979 }
401149ba73fd Fixed bug with benchmark option
albeu
parents: 4203
diff changeset
3980
5983
4d868c3c9fff some cleanup around uninit()
arpi
parents: 5955
diff changeset
3981 // time to uninit all, except global stuff:
7677
33562a65e9e8 _EXPERIMENTAL_ option: -fixed-vo for libvo spec compliance testing
arpi
parents: 7628
diff changeset
3982 uninit_player(INITED_ALL-(INITED_GUI+INITED_INPUT+(fixed_vo?INITED_VO:0)));
5154
f67115a72b7c init/uninit libvo/ao/getch2/cache2 order fixed
arpi
parents: 5151
diff changeset
3983
9048
arpi
parents: 9045
diff changeset
3984 #ifdef USE_SUB
9870
09d630a4f991 support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents: 9831
diff changeset
3985 if ( set_of_sub_size > 0 )
9048
arpi
parents: 9045
diff changeset
3986 {
arpi
parents: 9045
diff changeset
3987 current_module="sub_free";
9870
09d630a4f991 support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents: 9831
diff changeset
3988 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
3989 sub_free( set_of_subtitles[i] );
09d630a4f991 support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents: 9831
diff changeset
3990 set_of_sub_size = 0;
9048
arpi
parents: 9045
diff changeset
3991 vo_sub=NULL;
9870
09d630a4f991 support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents: 9831
diff changeset
3992 subdata=NULL;
9048
arpi
parents: 9045
diff changeset
3993 }
arpi
parents: 9045
diff changeset
3994 #endif
arpi
parents: 9045
diff changeset
3995
4156
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4152
diff changeset
3996 if(eof == PT_NEXT_ENTRY || eof == PT_PREV_ENTRY) {
4221
401149ba73fd Fixed bug with benchmark option
albeu
parents: 4203
diff changeset
3997 eof = eof == PT_NEXT_ENTRY ? 1 : -1;
8198
1935017c0f71 Experimantal OSD menu
albeu
parents: 8164
diff changeset
3998 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
3999 eof = 1;
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
4000 } else {
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
4001 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
4002 playtree_iter = NULL;
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
4003 }
8198
1935017c0f71 Experimantal OSD menu
albeu
parents: 8164
diff changeset
4004 play_tree_step = 1;
4156
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4152
diff changeset
4005 } 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
4006 eof = eof == PT_UP_NEXT ? 1 : -1;
9368
918248af048f fuckin' 10l
pontscho
parents: 9352
diff changeset
4007 if ( playtree_iter ) {
918248af048f fuckin' 10l
pontscho
parents: 9352
diff changeset
4008 if(play_tree_iter_up_step(playtree_iter,eof,0) == PLAY_TREE_ITER_ENTRY) {
918248af048f fuckin' 10l
pontscho
parents: 9352
diff changeset
4009 eof = 1;
918248af048f fuckin' 10l
pontscho
parents: 9352
diff changeset
4010 } else {
918248af048f fuckin' 10l
pontscho
parents: 9352
diff changeset
4011 play_tree_iter_free(playtree_iter);
918248af048f fuckin' 10l
pontscho
parents: 9352
diff changeset
4012 playtree_iter = NULL;
918248af048f fuckin' 10l
pontscho
parents: 9352
diff changeset
4013 }
918248af048f fuckin' 10l
pontscho
parents: 9352
diff changeset
4014 }
5154
f67115a72b7c init/uninit libvo/ao/getch2/cache2 order fixed
arpi
parents: 5151
diff changeset
4015 } else { // NEXT PREV SRC
4156
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4152
diff changeset
4016 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
4017 }
1639
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
4018
4045
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
4019 if(eof == 0) eof = 1;
1641
b7dae998505c free stream/demuxer. continue playback with next file if error found
arpi
parents: 1639
diff changeset
4020
4045
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
4021 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
4022 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
4023 if(filename == NULL) {
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
4024 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
4025 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
4026 playtree_iter = NULL;
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
4027 };
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
4028 } else
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
4029 break;
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
4030 }
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
4031
5910
20c335d98ab3 fix fullscreen bug es ilyen libvo not initialized bug with gui igy
pontscho
parents: 5908
diff changeset
4032 #ifdef HAVE_NEW_GUI
20c335d98ab3 fix fullscreen bug es ilyen libvo not initialized bug with gui igy
pontscho
parents: 5908
diff changeset
4033 if( use_gui && !playtree_iter )
20c335d98ab3 fix fullscreen bug es ilyen libvo not initialized bug with gui igy
pontscho
parents: 5908
diff changeset
4034 {
20c335d98ab3 fix fullscreen bug es ilyen libvo not initialized bug with gui igy
pontscho
parents: 5908
diff changeset
4035 #ifdef USE_DVDREAD
6280
cf2c2b92d1a7 add VCD support for GUI
pontscho
parents: 6218
diff changeset
4036 if ( !guiIntfStruct.DiskChanged )
5910
20c335d98ab3 fix fullscreen bug es ilyen libvo not initialized bug with gui igy
pontscho
parents: 5908
diff changeset
4037 #endif
6713
cc917a581b6e add simple playlist support
pontscho
parents: 6699
diff changeset
4038 mplEnd();
5910
20c335d98ab3 fix fullscreen bug es ilyen libvo not initialized bug with gui igy
pontscho
parents: 5908
diff changeset
4039 }
20c335d98ab3 fix fullscreen bug es ilyen libvo not initialized bug with gui igy
pontscho
parents: 5908
diff changeset
4040 #endif
20c335d98ab3 fix fullscreen bug es ilyen libvo not initialized bug with gui igy
pontscho
parents: 5908
diff changeset
4041
10560
11826d9f90c7 this patch fixes
arpi
parents: 10557
diff changeset
4042 if(use_gui || playtree_iter != NULL){
1641
b7dae998505c free stream/demuxer. continue playback with next file if error found
arpi
parents: 1639
diff changeset
4043
4045
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
4044 eof = 0;
1641
b7dae998505c free stream/demuxer. continue playback with next file if error found
arpi
parents: 1639
diff changeset
4045 goto play_next_file;
1639
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
4046 }
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
4047
10219
beeed3a9606e reversed my 10l
alex
parents: 10217
diff changeset
4048 #ifdef HAVE_FREETYPE
7621
7caeb275ad26 uninit cleanup again... thx to Nilmoni Deb for bugreport
arpi
parents: 7614
diff changeset
4049 current_module="uninit_font";
7caeb275ad26 uninit cleanup again... thx to Nilmoni Deb for bugreport
arpi
parents: 7614
diff changeset
4050 if (vo_font) free_font_desc(vo_font);
7caeb275ad26 uninit cleanup again... thx to Nilmoni Deb for bugreport
arpi
parents: 7614
diff changeset
4051 vo_font = NULL;
7122
0dc9cb756b68 freetype 2.0/2.1+ support - disabled by default until bugs fixed
arpi
parents: 7111
diff changeset
4052 done_freetype();
0dc9cb756b68 freetype 2.0/2.1+ support - disabled by default until bugs fixed
arpi
parents: 7111
diff changeset
4053 #endif
0dc9cb756b68 freetype 2.0/2.1+ support - disabled by default until bugs fixed
arpi
parents: 7111
diff changeset
4054
8644
0bfd73828e33 This patch fixes so that the exit code (or return code if you like) is set
arpi
parents: 8635
diff changeset
4055 exit_player_with_rc(MSGTR_Exit_eof, 0);
1639
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
4056
109
ed4178146cc5 small code cleanup, removed unused variables
arpi_esp
parents: 103
diff changeset
4057 return 1;
ed4178146cc5 small code cleanup, removed unused variables
arpi_esp
parents: 103
diff changeset
4058 }