annotate mplayer.c @ 17057:d301c1833d12

Add a function to remove osd msg and use it to remove the "OSD: enabled" msg when switching the OSD to a level above 1.
author albeu
date Sun, 27 Nov 2005 23:29:33 +0000
parents ded1cc937221
children f067a9de373c
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 */
16049
0ccf19820216 define SIGHUP and SIGPIPE for MinGW and catch SIGPIPE also in mplayer
reimar
parents: 16036
diff changeset
22 #define SIGPIPE 13 /* broken pipe */
10928
f2313bd91594 add a read function for slave mode on mingw
faust3
parents: 10917
diff changeset
23 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
24 #endif
0397b461f0fb MINGW32 port and select()less fifocode by Arpi
faust3
parents: 9752
diff changeset
25
1428
a90d889eb649 largefile patch by Stephen Davies <steve@daviesfam.org>
arpi
parents: 1422
diff changeset
26 #include <sys/time.h>
a90d889eb649 largefile patch by Stephen Davies <steve@daviesfam.org>
arpi
parents: 1422
diff changeset
27 #include <sys/stat.h>
a90d889eb649 largefile patch by Stephen Davies <steve@daviesfam.org>
arpi
parents: 1422
diff changeset
28
a90d889eb649 largefile patch by Stephen Davies <steve@daviesfam.org>
arpi
parents: 1422
diff changeset
29 #include <signal.h>
a90d889eb649 largefile patch by Stephen Davies <steve@daviesfam.org>
arpi
parents: 1422
diff changeset
30 #include <time.h>
a90d889eb649 largefile patch by Stephen Davies <steve@daviesfam.org>
arpi
parents: 1422
diff changeset
31 #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
32 #include <limits.h>
1428
a90d889eb649 largefile patch by Stephen Davies <steve@daviesfam.org>
arpi
parents: 1422
diff changeset
33
5112
70fb281bb13c changed printf's to mp_msg
alex
parents: 5106
diff changeset
34 #include <errno.h>
70fb281bb13c changed printf's to mp_msg
alex
parents: 5106
diff changeset
35
1430
1728d249c783 missing unistd.h (requires for off_t under freebsd)
arpi
parents: 1429
diff changeset
36 #include "version.h"
1584
e49b3927c793 more messages for translator :)
arpi
parents: 1583
diff changeset
37
1564
9fa2a290fa99 mp_msg init
arpi
parents: 1548
diff changeset
38 #include "mp_msg.h"
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
39
1584
e49b3927c793 more messages for translator :)
arpi
parents: 1583
diff changeset
40 #define HELP_MP_DEFINE_STATIC
e49b3927c793 more messages for translator :)
arpi
parents: 1583
diff changeset
41 #include "help_mp.h"
e49b3927c793 more messages for translator :)
arpi
parents: 1583
diff changeset
42
8164
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents: 8123
diff changeset
43 #include "m_option.h"
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents: 8123
diff changeset
44 #include "m_config.h"
9752
3db72324a0fe Stream cleanup, don't use blah_on options anymore.
albeu
parents: 9695
diff changeset
45
151
9708d4b2765b cfgparser fix
szabii
parents: 150
diff changeset
46 #include "cfg-mplayer-def.h"
147
0a0d7dd8fb51 new command line/config file parser
szabii
parents: 117
diff changeset
47
1422
d02e0dcaf077 libvo2 support
arpi
parents: 1421
diff changeset
48 #ifdef USE_SUB
258
66017e126280 subtitles (.sub files) support
arpi_esp
parents: 240
diff changeset
49 #include "subreader.h"
1422
d02e0dcaf077 libvo2 support
arpi
parents: 1421
diff changeset
50 #endif
258
66017e126280 subtitles (.sub files) support
arpi_esp
parents: 240
diff changeset
51
36
846535ace7a2 libmpeg2-0.2.0 merge
arpi_esp
parents: 33
diff changeset
52 #include "libvo/video_out.h"
1422
d02e0dcaf077 libvo2 support
arpi
parents: 1421
diff changeset
53
5293
fd992ece4367 include font_load.h directly, instead of via video_out.h
arpi
parents: 5288
diff changeset
54 #include "libvo/font_load.h"
220
5348fa1313fe OSD functionality improved
arpi_esp
parents: 215
diff changeset
55 #include "libvo/sub.h"
36
846535ace7a2 libmpeg2-0.2.0 merge
arpi_esp
parents: 33
diff changeset
56
10211
4bc481804519 warning fixes by Dominik Mierzejewski <dominik@rangers.eu.org>
alex
parents: 10167
diff changeset
57 #ifdef HAVE_X11
4bc481804519 warning fixes by Dominik Mierzejewski <dominik@rangers.eu.org>
alex
parents: 10167
diff changeset
58 #include "libvo/x11_common.h"
4bc481804519 warning fixes by Dominik Mierzejewski <dominik@rangers.eu.org>
alex
parents: 10167
diff changeset
59 #endif
4bc481804519 warning fixes by Dominik Mierzejewski <dominik@rangers.eu.org>
alex
parents: 10167
diff changeset
60
955
3a3304cd9fd5 libao support
arpi_esp
parents: 940
diff changeset
61 #include "libao2/audio_out.h"
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;
16347
da2926d990ce Adds -idle, an option to make MPlayer wait for input ('loadfile' or
ods15
parents: 16346
diff changeset
88 int player_idle_mode=0;
362
463699f15eb4 static removed from verbose definition
szabii
parents: 360
diff changeset
89 int verbose=0;
7864
dacc35bc92c7 add -identify switch
ranma
parents: 7854
diff changeset
90 int identify=0;
11875
6b28eb95c08b * changes mencoder's exit code on explicit kill to 2
attila
parents: 11778
diff changeset
91 int quiet=0;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
92
15042
265d8b8adbbe windows priority support patch by Rune Petersen <runner at mail.tele.dk> with the freedom to shoot yourself in the foot
faust3
parents: 14818
diff changeset
93 #ifdef WIN32
265d8b8adbbe windows priority support patch by Rune Petersen <runner at mail.tele.dk> with the freedom to shoot yourself in the foot
faust3
parents: 14818
diff changeset
94 char * proc_priority=NULL;
265d8b8adbbe windows priority support patch by Rune Petersen <runner at mail.tele.dk> with the freedom to shoot yourself in the foot
faust3
parents: 14818
diff changeset
95 #endif
265d8b8adbbe windows priority support patch by Rune Petersen <runner at mail.tele.dk> with the freedom to shoot yourself in the foot
faust3
parents: 14818
diff changeset
96
398
f5918fc8df10 more cleanup of video decoding
arpi_esp
parents: 396
diff changeset
97 #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
98 #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
99
3015
8bf21c807656 RTC is autodetected
arpi
parents: 2941
diff changeset
100 #ifdef HAVE_RTC
14381
dc7b86065e3c RTC support on FreeBSD, inspired by a patch from Michael Johnson
diego
parents: 14296
diff changeset
101 #ifdef __linux__
2889
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
102 #include <linux/rtc.h>
14381
dc7b86065e3c RTC support on FreeBSD, inspired by a patch from Michael Johnson
diego
parents: 14296
diff changeset
103 #else
dc7b86065e3c RTC support on FreeBSD, inspired by a patch from Michael Johnson
diego
parents: 14296
diff changeset
104 #include <rtc.h>
dc7b86065e3c RTC support on FreeBSD, inspired by a patch from Michael Johnson
diego
parents: 14296
diff changeset
105 #define RTC_IRQP_SET RTCIO_IRQP_SET
dc7b86065e3c RTC support on FreeBSD, inspired by a patch from Michael Johnson
diego
parents: 14296
diff changeset
106 #define RTC_PIE_ON RTCIO_PIE_ON
16490
f17b3c152fd6 Add comments to a few #endif statements in order to make clear which
diego
parents: 16489
diff changeset
107 #endif /* __linux__ */
f17b3c152fd6 Add comments to a few #endif statements in order to make clear which
diego
parents: 16489
diff changeset
108 #endif /* HAVE_RTC */
2889
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
109
2941
60c1b7c0ea21 added support for norm=,chanlist=,channel= and also on-the-fly channel chaning with keys
alex
parents: 2897
diff changeset
110 #ifdef USE_TV
60c1b7c0ea21 added support for norm=,chanlist=,channel= and also on-the-fly channel chaning with keys
alex
parents: 2897
diff changeset
111 #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
112 #endif
60c1b7c0ea21 added support for norm=,chanlist=,channel= and also on-the-fly channel chaning with keys
alex
parents: 2897
diff changeset
113
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents: 9593
diff changeset
114 #ifdef HAS_DVBIN_SUPPORT
76c6d8f1ebf5 this is a combo patch that:
arpi
parents: 9593
diff changeset
115 #include "libmpdemux/dvbin.h"
10708
a57e8d980652 This patch fixes:
alex
parents: 10707
diff changeset
116 static int last_dvb_step = 1;
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents: 9593
diff changeset
117 #endif
76c6d8f1ebf5 this is a combo patch that:
arpi
parents: 9593
diff changeset
118
258
66017e126280 subtitles (.sub files) support
arpi_esp
parents: 240
diff changeset
119 //**************************************************************************//
4045
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
120 // Playtree
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
121 //**************************************************************************//
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
122 #include "playtree.h"
10211
4bc481804519 warning fixes by Dominik Mierzejewski <dominik@rangers.eu.org>
alex
parents: 10167
diff changeset
123 #include "playtreeparser.h"
4bc481804519 warning fixes by Dominik Mierzejewski <dominik@rangers.eu.org>
alex
parents: 10167
diff changeset
124
4bc481804519 warning fixes by Dominik Mierzejewski <dominik@rangers.eu.org>
alex
parents: 10167
diff changeset
125 #ifdef HAVE_NEW_GUI
4bc481804519 warning fixes by Dominik Mierzejewski <dominik@rangers.eu.org>
alex
parents: 10167
diff changeset
126 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
127 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
128 #endif
4045
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
129
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
130 play_tree_t* playtree;
8198
1935017c0f71 Experimantal OSD menu
albeu
parents: 8164
diff changeset
131 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
132
4156
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4152
diff changeset
133 #define PT_NEXT_ENTRY 1
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4152
diff changeset
134 #define PT_PREV_ENTRY -1
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4152
diff changeset
135 #define PT_NEXT_SRC 2
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4152
diff changeset
136 #define PT_PREV_SRC -2
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4152
diff changeset
137 #define PT_UP_NEXT 3
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4152
diff changeset
138 #define PT_UP_PREV -3
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4152
diff changeset
139
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4152
diff changeset
140 //**************************************************************************//
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4152
diff changeset
141 // Config
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4152
diff changeset
142 //**************************************************************************//
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4152
diff changeset
143 m_config_t* mconfig;
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4152
diff changeset
144
8164
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents: 8123
diff changeset
145 extern play_tree_t*
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents: 8123
diff changeset
146 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
147 extern int
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents: 8123
diff changeset
148 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
149
4045
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
150 //**************************************************************************//
258
66017e126280 subtitles (.sub files) support
arpi_esp
parents: 240
diff changeset
151 // Config file
66017e126280 subtitles (.sub files) support
arpi_esp
parents: 240
diff changeset
152 //**************************************************************************//
66017e126280 subtitles (.sub files) support
arpi_esp
parents: 240
diff changeset
153
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
154 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
155
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
156 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
157 return m_config_parse_config_file(mconfig, filename);
162
effc62af528c new option: -include
szabii
parents: 154
diff changeset
158 }
effc62af528c new option: -include
szabii
parents: 154
diff changeset
159
2557
6a74454ea121 some cleanup
arpi
parents: 2550
diff changeset
160 #include "get_path.c"
178
55206b791586 get_path()
szabii
parents: 175
diff changeset
161
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
162 //**************************************************************************//
9695
68c44d3530c8 Improved xscreensaver support.
ranma
parents: 9610
diff changeset
163 // XScreensaver
68c44d3530c8 Improved xscreensaver support.
ranma
parents: 9610
diff changeset
164 //**************************************************************************//
68c44d3530c8 Improved xscreensaver support.
ranma
parents: 9610
diff changeset
165
10661
49d7d02f4485 X11_FULLSCREEN vs HAVE_X11 definitions and some warning fixes
alex
parents: 10646
diff changeset
166 #ifdef HAVE_X11
11999
239623f1e8a1 Use system clock for xscreensaver pings
ranma
parents: 11977
diff changeset
167 void xscreensaver_heartbeat(void);
10661
49d7d02f4485 X11_FULLSCREEN vs HAVE_X11 definitions and some warning fixes
alex
parents: 10646
diff changeset
168 #endif
9695
68c44d3530c8 Improved xscreensaver support.
ranma
parents: 9610
diff changeset
169
68c44d3530c8 Improved xscreensaver support.
ranma
parents: 9610
diff changeset
170 //**************************************************************************//
442
0828c5d13418 fixed mplayer.c
gabucino
parents: 440
diff changeset
171 //**************************************************************************//
0828c5d13418 fixed mplayer.c
gabucino
parents: 440
diff changeset
172 // Input media streaming & demultiplexer:
0828c5d13418 fixed mplayer.c
gabucino
parents: 440
diff changeset
173 //**************************************************************************//
0828c5d13418 fixed mplayer.c
gabucino
parents: 440
diff changeset
174
1289
3f490fad9bdf some code clanup (first step to libdemuxer)
arpi
parents: 1286
diff changeset
175 static int max_framesize=0;
3f490fad9bdf some code clanup (first step to libdemuxer)
arpi
parents: 1286
diff changeset
176
7559
b645204ea527 some cleanup - made private vars/funcs static, removed obsolete externs
arpi
parents: 7529
diff changeset
177 #include "libmpdemux/stream.h"
b645204ea527 some cleanup - made private vars/funcs static, removed obsolete externs
arpi
parents: 7529
diff changeset
178 #include "libmpdemux/demuxer.h"
b645204ea527 some cleanup - made private vars/funcs static, removed obsolete externs
arpi
parents: 7529
diff changeset
179 #include "libmpdemux/stheader.h"
b645204ea527 some cleanup - made private vars/funcs static, removed obsolete externs
arpi
parents: 7529
diff changeset
180 //#include "parse_es.h"
13132
faust3
parents: 13129
diff changeset
181 #ifdef HAVE_MATROSKA
faust3
parents: 13129
diff changeset
182 #include "libmpdemux/matroska.h"
faust3
parents: 13129
diff changeset
183 #endif
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
184
5607
1972c3475d93 mp_image.h and img_format.h moved to libmpcodecs
arpi
parents: 5572
diff changeset
185 #include "libmpcodecs/dec_audio.h"
1972c3475d93 mp_image.h and img_format.h moved to libmpcodecs
arpi
parents: 5572
diff changeset
186 #include "libmpcodecs/dec_video.h"
8198
1935017c0f71 Experimantal OSD menu
albeu
parents: 8164
diff changeset
187 #include "libmpcodecs/mp_image.h"
1935017c0f71 Experimantal OSD menu
albeu
parents: 8164
diff changeset
188 #include "libmpcodecs/vf.h"
2563
fc124f9db88e more cleanup, warnings fixed
arpi
parents: 2557
diff changeset
189
8123
9fc45fe0d444 *HUGE* set of compiler warning fixes, unused variables removal
arpi
parents: 8068
diff changeset
190 extern void vf_list_plugins();
9fc45fe0d444 *HUGE* set of compiler warning fixes, unused variables removal
arpi
parents: 8068
diff changeset
191
111
3b4ccfecb823 using setjmp/longjmp to handle sig11 in libmpeg2
arpi_esp
parents: 109
diff changeset
192 //**************************************************************************//
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
193 //**************************************************************************//
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
194
112
b69d29c06b3f code cleanup around codecctrl
arpi_esp
parents: 111
diff changeset
195 // Common FIFO functions, and keyboard/event FIFO code
b69d29c06b3f code cleanup around codecctrl
arpi_esp
parents: 111
diff changeset
196 #include "fifo.c"
12816
fba780800efe -use-stdin renamed to -noconsolecontrols.
diego
parents: 12753
diff changeset
197 int noconsolecontrols=0;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
198 //**************************************************************************//
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
199
6755
a31b9f15cbff - fix audio equalizer
pontscho
parents: 6713
diff changeset
200 vo_functions_t *video_out=NULL;
4788
d678ce495a75 Moved HW dependent mixer stuff to libao and removed master switch
anders
parents: 4787
diff changeset
201 ao_functions_t *audio_out=NULL;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
202
7677
33562a65e9e8 _EXPERIMENTAL_ option: -fixed-vo for libvo spec compliance testing
arpi
parents: 7628
diff changeset
203 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
204 int eof=0;
7677
33562a65e9e8 _EXPERIMENTAL_ option: -fixed-vo for libvo spec compliance testing
arpi
parents: 7628
diff changeset
205
2557
6a74454ea121 some cleanup
arpi
parents: 2550
diff changeset
206 // benchmark:
1291
36ed1692c0b8 video codec stuff moved to dec_video.c
arpi
parents: 1289
diff changeset
207 double video_time_usage=0;
36ed1692c0b8 video codec stuff moved to dec_video.c
arpi
parents: 1289
diff changeset
208 double vout_time_usage=0;
1289
3f490fad9bdf some code clanup (first step to libdemuxer)
arpi
parents: 1286
diff changeset
209 static double audio_time_usage=0;
3f490fad9bdf some code clanup (first step to libdemuxer)
arpi
parents: 1286
diff changeset
210 static int total_time_usage_start=0;
5621
0426f9b887cd some more statistics: BENCHMARKn
arpi
parents: 5612
diff changeset
211 static int total_frame_cnt=0;
0426f9b887cd some more statistics: BENCHMARKn
arpi
parents: 5612
diff changeset
212 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
213 int benchmark=0;
1124
0e95f30ffd4c -frames and -benchmark options to make chl & gabucino happy
arpi_esp
parents: 1059
diff changeset
214
1014
e01dc1a88edf fixed punkso's mess... local variables moved back to main()
arpi_esp
parents: 1009
diff changeset
215 // options:
6796
9c828335b2d0 add preferences to gui
pontscho
parents: 6792
diff changeset
216 int auto_quality=0;
1496
8c3e93ef116d cleanup...
arpi
parents: 1487
diff changeset
217 static int output_quality=0;
1439
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
218
7605
c3bbe602aff3 new option -speed, to set playback speed rate (examples: -speed 1:3 or -speed 5)
arpi
parents: 7604
diff changeset
219 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
220
1709
a4e0211455d8 GUI integration, step 1
arpi
parents: 1694
diff changeset
221 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
222
64b8c5a07c2c - It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents: 9217
diff changeset
223 #ifdef HAVE_NEW_GUI
64b8c5a07c2c - It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents: 9217
diff changeset
224 int enqueue=0;
64b8c5a07c2c - It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents: 9217
diff changeset
225 #endif
64b8c5a07c2c - It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents: 9217
diff changeset
226
8612
a61d1b326beb It shows not just the progressbar, but progressbar /and/ percentage
arpi
parents: 8606
diff changeset
227 #define MAX_OSD_LEVEL 3
17021
ded1cc937221 Make the osd command only switch between enabled/disabled when
albeu
parents: 16992
diff changeset
228 #define MAX_TERM_OSD_LEVEL 1
1709
a4e0211455d8 GUI integration, step 1
arpi
parents: 1694
diff changeset
229
6921
762c98c47f01 osdlevel=1 by default
arpi
parents: 6914
diff changeset
230 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
231 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
232 int osd_visible=100;
16992
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
233 static int osd_function=OSD_PLAY;
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
234 static int osd_show_percentage = 0;
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
235 static int osd_duration = 1000;
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
236
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
237 static int term_osd = 1;
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
238 static char* term_osd_esc = "\x1b[A\r\x1b[K";
2557
6a74454ea121 some cleanup
arpi
parents: 2550
diff changeset
239 // seek:
7559
b645204ea527 some cleanup - made private vars/funcs static, removed obsolete externs
arpi
parents: 7529
diff changeset
240 static char *seek_to_sec=NULL;
b645204ea527 some cleanup - made private vars/funcs static, removed obsolete externs
arpi
parents: 7529
diff changeset
241 static off_t seek_to_byte=0;
b645204ea527 some cleanup - made private vars/funcs static, removed obsolete externs
arpi
parents: 7529
diff changeset
242 static off_t step_sec=0;
b645204ea527 some cleanup - made private vars/funcs static, removed obsolete externs
arpi
parents: 7529
diff changeset
243 static int loop_times=-1;
8784
6e190ea2abba don't show OSD progbar when -loop seeks back
arpi
parents: 8745
diff changeset
244 static int loop_seek=0;
7559
b645204ea527 some cleanup - made private vars/funcs static, removed obsolete externs
arpi
parents: 7529
diff changeset
245
7576
c135f7646036 new opt: -autosync, controls ao->get_delay() smoothing (default: disabled)
arpi
parents: 7563
diff changeset
246 // A/V sync:
8311
37ab4e646f65 add autosync && some 10l bugfix
pontscho
parents: 8306
diff changeset
247 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
248
7559
b645204ea527 some cleanup - made private vars/funcs static, removed obsolete externs
arpi
parents: 7529
diff changeset
249 // may be changed by GUI: (FIXME!)
2557
6a74454ea121 some cleanup
arpi
parents: 2550
diff changeset
250 float rel_seek_secs=0;
6a74454ea121 some cleanup
arpi
parents: 2550
diff changeset
251 int abs_seek_pos=0;
6a74454ea121 some cleanup
arpi
parents: 2550
diff changeset
252
6a74454ea121 some cleanup
arpi
parents: 2550
diff changeset
253 // codecs:
7529
c276bfb414fb removed obsolete/unused audio|video_fm|codec, has_audio|video
arpi
parents: 7526
diff changeset
254 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
255 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
256 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
257 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
258
16175
6b86089c2edd Demuxer modularization
rtognimp
parents: 16152
diff changeset
259 // demuxer:
6b86089c2edd Demuxer modularization
rtognimp
parents: 16152
diff changeset
260 extern char *demuxer_name; // override demuxer
6b86089c2edd Demuxer modularization
rtognimp
parents: 16152
diff changeset
261 extern char *audio_demuxer_name; // override audio demuxer
6b86089c2edd Demuxer modularization
rtognimp
parents: 16152
diff changeset
262 extern char *sub_demuxer_name; // override sub demuxer
6b86089c2edd Demuxer modularization
rtognimp
parents: 16152
diff changeset
263
1014
e01dc1a88edf fixed punkso's mess... local variables moved back to main()
arpi_esp
parents: 1009
diff changeset
264 // streaming:
3532
19998399f4d5 Made audio_id and video_id non static variable.
bertrand
parents: 3499
diff changeset
265 int audio_id=-1;
19998399f4d5 Made audio_id and video_id non static variable.
bertrand
parents: 3499
diff changeset
266 int video_id=-1;
3618
772729dd7b40 better dvd support
pontscho
parents: 3597
diff changeset
267 int dvdsub_id=-1;
4079
ae78dd1d8daf Add vobsub support.
kmkaplan
parents: 4064
diff changeset
268 int vobsub_id=-1;
10167
531b00ad6f2d Support for selecting the audio track in Matroska files via -alang.
mosu
parents: 10116
diff changeset
269 char* audio_lang=NULL;
9870
09d630a4f991 support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents: 9831
diff changeset
270 char* dvdsub_lang=NULL;
5388
3af2729c5c87 * New command line switch for mplayer & mencoder:
kmkaplan
parents: 5380
diff changeset
271 static char* spudec_ifo=NULL;
6627
fd3ac41ee1a1 add equalizer support and fix some small bug...
pontscho
parents: 6623
diff changeset
272 char* filename=NULL; //"MI2-Trailer.avi";
10917
d45870f67728 Forced subtitles patch by Arne Driescher <driescher@mpi-magdeburg.mpg.de>
attila
parents: 10884
diff changeset
273 int forced_subs_only=0;
1014
e01dc1a88edf fixed punkso's mess... local variables moved back to main()
arpi_esp
parents: 1009
diff changeset
274
2353
a3daec6c49e4 cache full status added
arpi
parents: 2342
diff changeset
275 // cache2:
7881
aba9301ed3c4 allow cache to be disabled (-nocache should override cachesize autodetection
arpi
parents: 7867
diff changeset
276 int stream_cache_size=-1;
2353
a3daec6c49e4 cache full status added
arpi
parents: 2342
diff changeset
277 #ifdef USE_STREAM_CACHE
a3daec6c49e4 cache full status added
arpi
parents: 2342
diff changeset
278 extern int cache_fill_status;
12835
4235ae5a2d60 cache min fill adjustment, based on patch by Jeremy Huddleston
iive
parents: 12816
diff changeset
279
4235ae5a2d60 cache min fill adjustment, based on patch by Jeremy Huddleston
iive
parents: 12816
diff changeset
280 float stream_cache_min_percent=20.0;
16152
10a69a812eff remove unused cache-prefill and create cache-seek-min that controls when seek_long is prefered over waiting for cache to fill
iive
parents: 16079
diff changeset
281 float stream_cache_seek_min_percent=50.0;
2353
a3daec6c49e4 cache full status added
arpi
parents: 2342
diff changeset
282 #else
a3daec6c49e4 cache full status added
arpi
parents: 2342
diff changeset
283 #define cache_fill_status 0
a3daec6c49e4 cache full status added
arpi
parents: 2342
diff changeset
284 #endif
a3daec6c49e4 cache full status added
arpi
parents: 2342
diff changeset
285
2557
6a74454ea121 some cleanup
arpi
parents: 2550
diff changeset
286 // dump:
3257
b59502557e39 -dumpstream
arpi
parents: 3234
diff changeset
287 static char *stream_dump_name="stream.dump";
6796
9c828335b2d0 add preferences to gui
pontscho
parents: 6792
diff changeset
288 int stream_dump_type=0;
2557
6a74454ea121 some cleanup
arpi
parents: 2550
diff changeset
289
6a74454ea121 some cleanup
arpi
parents: 2550
diff changeset
290 // A-V sync:
1498
6174b815b5f4 PTS calc updates, fixes, cleanups, mess...
arpi
parents: 1497
diff changeset
291 static float default_max_pts_correction=-1;//0.01f;
6174b815b5f4 PTS calc updates, fixes, cleanups, mess...
arpi
parents: 1497
diff changeset
292 static float max_pts_correction=0;//default_max_pts_correction;
2557
6a74454ea121 some cleanup
arpi
parents: 2550
diff changeset
293 static float c_total=0;
6796
9c828335b2d0 add preferences to gui
pontscho
parents: 6792
diff changeset
294 float audio_delay=0;
1014
e01dc1a88edf fixed punkso's mess... local variables moved back to main()
arpi_esp
parents: 1009
diff changeset
295
2889
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
296 static int softsleep=0;
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
297
9055
4a42c0604ce1 - rewrite sub_fps
pontscho
parents: 9049
diff changeset
298 float force_fps=0;
2557
6a74454ea121 some cleanup
arpi
parents: 2550
diff changeset
299 static int force_srate=0;
7614
ce6a938aa6d3 Adding -format and -af switches
anders
parents: 7605
diff changeset
300 static int audio_output_format=0;
6796
9c828335b2d0 add preferences to gui
pontscho
parents: 6792
diff changeset
301 int frame_dropping=0; // option 0=no drop 1= drop vo 2= drop decode
2557
6a74454ea121 some cleanup
arpi
parents: 2550
diff changeset
302 static int play_n_frames=-1;
6590
bfc209bb3f48 -frames 0 fix, multifile frames support by tibcu
alex
parents: 6585
diff changeset
303 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
304
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
305 // screen info:
7562
92188b57a062 video out driver list support (like -vc, example: -vo xmga,xv,x11,)
arpi
parents: 7559
diff changeset
306 char** video_driver_list=NULL;
92188b57a062 video out driver list support (like -vc, example: -vo xmga,xv,x11,)
arpi
parents: 7559
diff changeset
307 char** audio_driver_list=NULL;
5075
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5072
diff changeset
308
7559
b645204ea527 some cleanup - made private vars/funcs static, removed obsolete externs
arpi
parents: 7529
diff changeset
309 extern char *vo_subdevice;
b645204ea527 some cleanup - made private vars/funcs static, removed obsolete externs
arpi
parents: 7529
diff changeset
310 extern char *ao_subdevice;
b645204ea527 some cleanup - made private vars/funcs static, removed obsolete externs
arpi
parents: 7529
diff changeset
311
7451
8669e56d2d98 some mpcodecs option declaration moved to cfg-*, as aren;t used by
arpi
parents: 7450
diff changeset
312 // codec outfmt flags (defined in libmpcodecs/vd.c)
5075
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5072
diff changeset
313 extern int vo_flags;
1014
e01dc1a88edf fixed punkso's mess... local variables moved back to main()
arpi_esp
parents: 1009
diff changeset
314
e01dc1a88edf fixed punkso's mess... local variables moved back to main()
arpi_esp
parents: 1009
diff changeset
315 // sub:
212
7034ef1f685d new option: -font
arpi_esp
parents: 208
diff changeset
316 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
317 #ifdef HAVE_FONTCONFIG
11584
alex
parents: 11580
diff changeset
318 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
319 #endif
215
09d565842a33 font alpha resampling, see -ffactor
arpi_esp
parents: 212
diff changeset
320 float font_factor=0.75;
9870
09d630a4f991 support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents: 9831
diff changeset
321 char **sub_name=NULL;
258
66017e126280 subtitles (.sub files) support
arpi_esp
parents: 240
diff changeset
322 float sub_delay=0;
66017e126280 subtitles (.sub files) support
arpi_esp
parents: 240
diff changeset
323 float sub_fps=0;
510
2951d138ddaf add sub autoread & remove 'c' key
pontscho
parents: 500
diff changeset
324 int sub_auto = 1;
4079
ae78dd1d8daf Add vobsub support.
kmkaplan
parents: 4064
diff changeset
325 char *vobsub_name=NULL;
1255
94f2853ec6f4 -dsp option removed, displaying help text (-ao oss:dsp_path)
alex
parents: 1250
diff changeset
326 /*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
327 int subcc_enabled=0;
8361
2202c00001e3 overlapping subtitles support is now optional, can be disabled (-nooverlapsub)
arpi
parents: 8360
diff changeset
328 int suboverlap_enabled = 1;
7150
b212f74e14ec - add play time subtitle change support
pontscho
parents: 7142
diff changeset
329 #ifdef USE_SUB
9870
09d630a4f991 support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents: 9831
diff changeset
330 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
331 int set_of_sub_size = 0;
09d630a4f991 support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents: 9831
diff changeset
332 int set_of_sub_pos = -1;
7150
b212f74e14ec - add play time subtitle change support
pontscho
parents: 7142
diff changeset
333 float sub_last_pts = -303;
b212f74e14ec - add play time subtitle change support
pontscho
parents: 7142
diff changeset
334 #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
335 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
336 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
337 #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
338 #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
339 #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
340 #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
341 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
342 int global_sub_quiet_osd_hack = 0;
723
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
343
2321
5413f4fc560f uninit stream
arpi
parents: 2314
diff changeset
344 static stream_t* stream=NULL;
7058
2e5c07262861 new v4l capture patch by Jindrich Makovicka <makovick@kmlinux.fjfi.cvut.cz>:
arpi
parents: 7055
diff changeset
345 static demuxer_t *demuxer=NULL;
7621
7caeb275ad26 uninit cleanup again... thx to Nilmoni Deb for bugreport
arpi
parents: 7614
diff changeset
346 static sh_audio_t *sh_audio=NULL;
7caeb275ad26 uninit cleanup again... thx to Nilmoni Deb for bugreport
arpi
parents: 7614
diff changeset
347 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
348
4818
3473ca9ef158 new gui interface, and gtk moved into mplayer process. fork ... bleh :)
pontscho
parents: 4807
diff changeset
349 char* current_module=NULL; // for debugging
1856
52fc1dc76652 uninit fixed
arpi
parents: 1852
diff changeset
350
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
351 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
352 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
353 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
354 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
355 extern int vo_gamma_hue;
6781
924263b4df10 eq reworked
alex
parents: 6755
diff changeset
356
6755
a31b9f15cbff - fix audio equalizer
pontscho
parents: 6713
diff changeset
357 // ---
a31b9f15cbff - fix audio equalizer
pontscho
parents: 6713
diff changeset
358
8198
1935017c0f71 Experimantal OSD menu
albeu
parents: 8164
diff changeset
359 #ifdef HAVE_MENU
1935017c0f71 Experimantal OSD menu
albeu
parents: 8164
diff changeset
360 #include "m_struct.h"
1935017c0f71 Experimantal OSD menu
albeu
parents: 8164
diff changeset
361 #include "libmenu/menu.h"
1935017c0f71 Experimantal OSD menu
albeu
parents: 8164
diff changeset
362 extern void vf_menu_pause_update(struct vf_instance_s* vf);
1935017c0f71 Experimantal OSD menu
albeu
parents: 8164
diff changeset
363 extern vf_info_t vf_info_menu;
1935017c0f71 Experimantal OSD menu
albeu
parents: 8164
diff changeset
364 static vf_info_t* libmenu_vfs[] = {
1935017c0f71 Experimantal OSD menu
albeu
parents: 8164
diff changeset
365 &vf_info_menu,
1935017c0f71 Experimantal OSD menu
albeu
parents: 8164
diff changeset
366 NULL
1935017c0f71 Experimantal OSD menu
albeu
parents: 8164
diff changeset
367 };
1935017c0f71 Experimantal OSD menu
albeu
parents: 8164
diff changeset
368 static vf_instance_t* vf_menu = NULL;
1935017c0f71 Experimantal OSD menu
albeu
parents: 8164
diff changeset
369 static int use_menu = 0;
1935017c0f71 Experimantal OSD menu
albeu
parents: 8164
diff changeset
370 static char* menu_cfg = NULL;
1935017c0f71 Experimantal OSD menu
albeu
parents: 8164
diff changeset
371 static char* menu_root = "main";
1935017c0f71 Experimantal OSD menu
albeu
parents: 8164
diff changeset
372 #endif
1935017c0f71 Experimantal OSD menu
albeu
parents: 8164
diff changeset
373
1935017c0f71 Experimantal OSD menu
albeu
parents: 8164
diff changeset
374
5055
534167719e91 nortc patch by Attila Kinali
atmos4
parents: 5046
diff changeset
375 #ifdef HAVE_RTC
7559
b645204ea527 some cleanup - made private vars/funcs static, removed obsolete externs
arpi
parents: 7529
diff changeset
376 static int nortc;
12681
6d815f12e3e5 rtc-device cmd option by James Noble
alex
parents: 12672
diff changeset
377 static char* rtc_device;
5055
534167719e91 nortc patch by Attila Kinali
atmos4
parents: 5046
diff changeset
378 #endif
534167719e91 nortc patch by Attila Kinali
atmos4
parents: 5046
diff changeset
379
8531
1aa2c9b460af Merged EDL 0.5 patch - it's something like Quicktime's edit lists.
arpi
parents: 8494
diff changeset
380 #ifdef USE_EDL
13858
4178a4eee72c fixed some doxygen comments, patch by Oded Shimon
reynaldo
parents: 13857
diff changeset
381 edl_record_ptr edl_records = NULL; ///< EDL entries memory area
4178a4eee72c fixed some doxygen comments, patch by Oded Shimon
reynaldo
parents: 13857
diff changeset
382 edl_record_ptr next_edl_record = NULL; ///< only for traversing edl_records
13867
4b9c901a6d23 Fix EDL mute behavior, Patch by Oded Shimon
reynaldo
parents: 13858
diff changeset
383 short user_muted = 0; ///< Stores whether User wanted muted mode.
13882
8a928d5b42b8 Replaces edl_mute_count with togle making code more understandable, other trivial list suggested changes too, Patch by Oded Shimon
reynaldo
parents: 13868
diff changeset
384 short edl_muted = 0; ///< Stores whether EDL is currently in muted mode.
13858
4178a4eee72c fixed some doxygen comments, patch by Oded Shimon
reynaldo
parents: 13857
diff changeset
385 short edl_decision = 0; ///< 1 when an EDL operation has been made
4178a4eee72c fixed some doxygen comments, patch by Oded Shimon
reynaldo
parents: 13857
diff changeset
386 FILE* edl_fd = NULL; ///< fd to write to when in -edlout mode
8531
1aa2c9b460af Merged EDL 0.5 patch - it's something like Quicktime's edit lists.
arpi
parents: 8494
diff changeset
387 #endif
1aa2c9b460af Merged EDL 0.5 patch - it's something like Quicktime's edit lists.
arpi
parents: 8494
diff changeset
388
1856
52fc1dc76652 uninit fixed
arpi
parents: 1852
diff changeset
389 static unsigned int inited_flags=0;
52fc1dc76652 uninit fixed
arpi
parents: 1852
diff changeset
390 #define INITED_VO 1
52fc1dc76652 uninit fixed
arpi
parents: 1852
diff changeset
391 #define INITED_AO 2
52fc1dc76652 uninit fixed
arpi
parents: 1852
diff changeset
392 #define INITED_GUI 4
52fc1dc76652 uninit fixed
arpi
parents: 1852
diff changeset
393 #define INITED_GETCH2 8
3034
24d3dca4e813 DVD sub patch by Kim Minh Kaplan <kmkaplan@selfoffice.com>
arpi
parents: 3015
diff changeset
394 #define INITED_SPUDEC 32
2321
5413f4fc560f uninit stream
arpi
parents: 2314
diff changeset
395 #define INITED_STREAM 64
4431
44c23fd75005 Added uninit to input
albeu
parents: 4418
diff changeset
396 #define INITED_INPUT 128
6110
7bea806b9c5f Improvment for spu subtitles.
albeu
parents: 6082
diff changeset
397 #define INITED_VOBSUB 256
7621
7caeb275ad26 uninit cleanup again... thx to Nilmoni Deb for bugreport
arpi
parents: 7614
diff changeset
398 #define INITED_DEMUXER 512
7caeb275ad26 uninit cleanup again... thx to Nilmoni Deb for bugreport
arpi
parents: 7614
diff changeset
399 #define INITED_ACODEC 1024
7caeb275ad26 uninit cleanup again... thx to Nilmoni Deb for bugreport
arpi
parents: 7614
diff changeset
400 #define INITED_VCODEC 2048
1856
52fc1dc76652 uninit fixed
arpi
parents: 1852
diff changeset
401 #define INITED_ALL 0xFFFF
52fc1dc76652 uninit fixed
arpi
parents: 1852
diff changeset
402
7559
b645204ea527 some cleanup - made private vars/funcs static, removed obsolete externs
arpi
parents: 7529
diff changeset
403 static void uninit_player(unsigned int mask){
1856
52fc1dc76652 uninit fixed
arpi
parents: 1852
diff changeset
404 mask=inited_flags&mask;
5154
f67115a72b7c init/uninit libvo/ao/getch2/cache2 order fixed
arpi
parents: 5151
diff changeset
405
f67115a72b7c init/uninit libvo/ao/getch2/cache2 order fixed
arpi
parents: 5151
diff changeset
406 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
407
7621
7caeb275ad26 uninit cleanup again... thx to Nilmoni Deb for bugreport
arpi
parents: 7614
diff changeset
408 if(mask&INITED_ACODEC){
7caeb275ad26 uninit cleanup again... thx to Nilmoni Deb for bugreport
arpi
parents: 7614
diff changeset
409 inited_flags&=~INITED_ACODEC;
7caeb275ad26 uninit cleanup again... thx to Nilmoni Deb for bugreport
arpi
parents: 7614
diff changeset
410 current_module="uninit_acodec";
7caeb275ad26 uninit cleanup again... thx to Nilmoni Deb for bugreport
arpi
parents: 7614
diff changeset
411 if(sh_audio) uninit_audio(sh_audio);
14254
21e72b6d8d11 Do not use audio plugins anymore
reimar
parents: 14245
diff changeset
412 #ifdef HAVE_NEW_GUI
21e72b6d8d11 Do not use audio plugins anymore
reimar
parents: 14245
diff changeset
413 guiGetEvent(guiSetAfilter, (char *)NULL);
21e72b6d8d11 Do not use audio plugins anymore
reimar
parents: 14245
diff changeset
414 #endif
7621
7caeb275ad26 uninit cleanup again... thx to Nilmoni Deb for bugreport
arpi
parents: 7614
diff changeset
415 sh_audio=NULL;
7caeb275ad26 uninit cleanup again... thx to Nilmoni Deb for bugreport
arpi
parents: 7614
diff changeset
416 }
7caeb275ad26 uninit cleanup again... thx to Nilmoni Deb for bugreport
arpi
parents: 7614
diff changeset
417
7caeb275ad26 uninit cleanup again... thx to Nilmoni Deb for bugreport
arpi
parents: 7614
diff changeset
418 if(mask&INITED_VCODEC){
7caeb275ad26 uninit cleanup again... thx to Nilmoni Deb for bugreport
arpi
parents: 7614
diff changeset
419 inited_flags&=~INITED_VCODEC;
7caeb275ad26 uninit cleanup again... thx to Nilmoni Deb for bugreport
arpi
parents: 7614
diff changeset
420 current_module="uninit_vcodec";
7caeb275ad26 uninit cleanup again... thx to Nilmoni Deb for bugreport
arpi
parents: 7614
diff changeset
421 if(sh_video) uninit_video(sh_video);
7caeb275ad26 uninit cleanup again... thx to Nilmoni Deb for bugreport
arpi
parents: 7614
diff changeset
422 sh_video=NULL;
8198
1935017c0f71 Experimantal OSD menu
albeu
parents: 8164
diff changeset
423 #ifdef HAVE_MENU
1935017c0f71 Experimantal OSD menu
albeu
parents: 8164
diff changeset
424 vf_menu=NULL;
1935017c0f71 Experimantal OSD menu
albeu
parents: 8164
diff changeset
425 #endif
7621
7caeb275ad26 uninit cleanup again... thx to Nilmoni Deb for bugreport
arpi
parents: 7614
diff changeset
426 }
7caeb275ad26 uninit cleanup again... thx to Nilmoni Deb for bugreport
arpi
parents: 7614
diff changeset
427
7caeb275ad26 uninit cleanup again... thx to Nilmoni Deb for bugreport
arpi
parents: 7614
diff changeset
428 if(mask&INITED_DEMUXER){
7caeb275ad26 uninit cleanup again... thx to Nilmoni Deb for bugreport
arpi
parents: 7614
diff changeset
429 inited_flags&=~INITED_DEMUXER;
7caeb275ad26 uninit cleanup again... thx to Nilmoni Deb for bugreport
arpi
parents: 7614
diff changeset
430 current_module="free_demuxer";
8023
3738cc2269a3 get stream back from the demuxer
arpi
parents: 7923
diff changeset
431 if(demuxer){
3738cc2269a3 get stream back from the demuxer
arpi
parents: 7923
diff changeset
432 stream=demuxer->stream;
3738cc2269a3 get stream back from the demuxer
arpi
parents: 7923
diff changeset
433 free_demuxer(demuxer);
3738cc2269a3 get stream back from the demuxer
arpi
parents: 7923
diff changeset
434 }
7621
7caeb275ad26 uninit cleanup again... thx to Nilmoni Deb for bugreport
arpi
parents: 7614
diff changeset
435 demuxer=NULL;
7caeb275ad26 uninit cleanup again... thx to Nilmoni Deb for bugreport
arpi
parents: 7614
diff changeset
436 }
7caeb275ad26 uninit cleanup again... thx to Nilmoni Deb for bugreport
arpi
parents: 7614
diff changeset
437
5830
4c17a92220fc uninit libvo before getch2 - requires for clean svgalib uninit
arpi
parents: 5798
diff changeset
438 // kill the cache process:
5154
f67115a72b7c init/uninit libvo/ao/getch2/cache2 order fixed
arpi
parents: 5151
diff changeset
439 if(mask&INITED_STREAM){
f67115a72b7c init/uninit libvo/ao/getch2/cache2 order fixed
arpi
parents: 5151
diff changeset
440 inited_flags&=~INITED_STREAM;
f67115a72b7c init/uninit libvo/ao/getch2/cache2 order fixed
arpi
parents: 5151
diff changeset
441 current_module="uninit_stream";
f67115a72b7c init/uninit libvo/ao/getch2/cache2 order fixed
arpi
parents: 5151
diff changeset
442 if(stream) free_stream(stream);
f67115a72b7c init/uninit libvo/ao/getch2/cache2 order fixed
arpi
parents: 5151
diff changeset
443 stream=NULL;
f67115a72b7c init/uninit libvo/ao/getch2/cache2 order fixed
arpi
parents: 5151
diff changeset
444 }
f67115a72b7c init/uninit libvo/ao/getch2/cache2 order fixed
arpi
parents: 5151
diff changeset
445
5830
4c17a92220fc uninit libvo before getch2 - requires for clean svgalib uninit
arpi
parents: 5798
diff changeset
446 if(mask&INITED_VO){
4c17a92220fc uninit libvo before getch2 - requires for clean svgalib uninit
arpi
parents: 5798
diff changeset
447 inited_flags&=~INITED_VO;
4c17a92220fc uninit libvo before getch2 - requires for clean svgalib uninit
arpi
parents: 5798
diff changeset
448 current_module="uninit_vo";
4c17a92220fc uninit libvo before getch2 - requires for clean svgalib uninit
arpi
parents: 5798
diff changeset
449 video_out->uninit();
4c17a92220fc uninit libvo before getch2 - requires for clean svgalib uninit
arpi
parents: 5798
diff changeset
450 video_out=NULL;
4c17a92220fc uninit libvo before getch2 - requires for clean svgalib uninit
arpi
parents: 5798
diff changeset
451 }
4c17a92220fc uninit libvo before getch2 - requires for clean svgalib uninit
arpi
parents: 5798
diff changeset
452
4c17a92220fc uninit libvo before getch2 - requires for clean svgalib uninit
arpi
parents: 5798
diff changeset
453 // 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
454 if(mask&INITED_GETCH2){
f67115a72b7c init/uninit libvo/ao/getch2/cache2 order fixed
arpi
parents: 5151
diff changeset
455 inited_flags&=~INITED_GETCH2;
f67115a72b7c init/uninit libvo/ao/getch2/cache2 order fixed
arpi
parents: 5151
diff changeset
456 current_module="uninit_getch2";
f67115a72b7c init/uninit libvo/ao/getch2/cache2 order fixed
arpi
parents: 5151
diff changeset
457 mp_msg(MSGT_CPLAYER,MSGL_DBG2,"\n[[[uninit getch2]]]\n");
f67115a72b7c init/uninit libvo/ao/getch2/cache2 order fixed
arpi
parents: 5151
diff changeset
458 // restore terminal:
f67115a72b7c init/uninit libvo/ao/getch2/cache2 order fixed
arpi
parents: 5151
diff changeset
459 getch2_disable();
f67115a72b7c init/uninit libvo/ao/getch2/cache2 order fixed
arpi
parents: 5151
diff changeset
460 }
f67115a72b7c init/uninit libvo/ao/getch2/cache2 order fixed
arpi
parents: 5151
diff changeset
461
6110
7bea806b9c5f Improvment for spu subtitles.
albeu
parents: 6082
diff changeset
462 if(mask&INITED_VOBSUB){
7bea806b9c5f Improvment for spu subtitles.
albeu
parents: 6082
diff changeset
463 inited_flags&=~INITED_VOBSUB;
7bea806b9c5f Improvment for spu subtitles.
albeu
parents: 6082
diff changeset
464 current_module="uninit_vobsub";
7621
7caeb275ad26 uninit cleanup again... thx to Nilmoni Deb for bugreport
arpi
parents: 7614
diff changeset
465 if(vo_vobsub) vobsub_close(vo_vobsub);
6110
7bea806b9c5f Improvment for spu subtitles.
albeu
parents: 6082
diff changeset
466 vo_vobsub=NULL;
7bea806b9c5f Improvment for spu subtitles.
albeu
parents: 6082
diff changeset
467 }
7bea806b9c5f Improvment for spu subtitles.
albeu
parents: 6082
diff changeset
468
3034
24d3dca4e813 DVD sub patch by Kim Minh Kaplan <kmkaplan@selfoffice.com>
arpi
parents: 3015
diff changeset
469 if (mask&INITED_SPUDEC){
24d3dca4e813 DVD sub patch by Kim Minh Kaplan <kmkaplan@selfoffice.com>
arpi
parents: 3015
diff changeset
470 inited_flags&=~INITED_SPUDEC;
24d3dca4e813 DVD sub patch by Kim Minh Kaplan <kmkaplan@selfoffice.com>
arpi
parents: 3015
diff changeset
471 current_module="uninit_spudec";
24d3dca4e813 DVD sub patch by Kim Minh Kaplan <kmkaplan@selfoffice.com>
arpi
parents: 3015
diff changeset
472 spudec_free(vo_spudec);
5411
6918c74caa4d 1 step closed to solving memory corruptions
arpi
parents: 5410
diff changeset
473 vo_spudec=NULL;
3034
24d3dca4e813 DVD sub patch by Kim Minh Kaplan <kmkaplan@selfoffice.com>
arpi
parents: 3015
diff changeset
474 }
5488
3f183ca22747 fixed SPU pts, it's 1024/90000 based instead of 1/100
arpi
parents: 5463
diff changeset
475
1856
52fc1dc76652 uninit fixed
arpi
parents: 1852
diff changeset
476 if(mask&INITED_AO){
52fc1dc76652 uninit fixed
arpi
parents: 1852
diff changeset
477 inited_flags&=~INITED_AO;
52fc1dc76652 uninit fixed
arpi
parents: 1852
diff changeset
478 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
479 audio_out->uninit(eof?0:1); audio_out=NULL;
1856
52fc1dc76652 uninit fixed
arpi
parents: 1852
diff changeset
480 }
52fc1dc76652 uninit fixed
arpi
parents: 1852
diff changeset
481
52fc1dc76652 uninit fixed
arpi
parents: 1852
diff changeset
482 #ifdef HAVE_NEW_GUI
52fc1dc76652 uninit fixed
arpi
parents: 1852
diff changeset
483 if(mask&INITED_GUI){
52fc1dc76652 uninit fixed
arpi
parents: 1852
diff changeset
484 inited_flags&=~INITED_GUI;
52fc1dc76652 uninit fixed
arpi
parents: 1852
diff changeset
485 current_module="uninit_gui";
4818
3473ca9ef158 new gui interface, and gtk moved into mplayer process. fork ... bleh :)
pontscho
parents: 4807
diff changeset
486 guiDone();
1856
52fc1dc76652 uninit fixed
arpi
parents: 1852
diff changeset
487 }
52fc1dc76652 uninit fixed
arpi
parents: 1852
diff changeset
488 #endif
52fc1dc76652 uninit fixed
arpi
parents: 1852
diff changeset
489
5830
4c17a92220fc uninit libvo before getch2 - requires for clean svgalib uninit
arpi
parents: 5798
diff changeset
490 if(mask&INITED_INPUT){
6429
bff56f37f2ff 10l typo, noticed by Nick K.
arpi
parents: 6311
diff changeset
491 inited_flags&=~INITED_INPUT;
5830
4c17a92220fc uninit libvo before getch2 - requires for clean svgalib uninit
arpi
parents: 5798
diff changeset
492 current_module="uninit_input";
4c17a92220fc uninit libvo before getch2 - requires for clean svgalib uninit
arpi
parents: 5798
diff changeset
493 mp_input_uninit();
4c17a92220fc uninit libvo before getch2 - requires for clean svgalib uninit
arpi
parents: 5798
diff changeset
494 }
4431
44c23fd75005 Added uninit to input
albeu
parents: 4418
diff changeset
495
1863
bb7710b16dc2 reset module status after uninit
arpi
parents: 1857
diff changeset
496 current_module=NULL;
1856
52fc1dc76652 uninit fixed
arpi
parents: 1852
diff changeset
497 }
52fc1dc76652 uninit fixed
arpi
parents: 1852
diff changeset
498
8644
0bfd73828e33 This patch fixes so that the exit code (or return code if you like) is set
arpi
parents: 8635
diff changeset
499 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
500
1856
52fc1dc76652 uninit fixed
arpi
parents: 1852
diff changeset
501 uninit_player(INITED_ALL);
10661
49d7d02f4485 X11_FULLSCREEN vs HAVE_X11 definitions and some warning fixes
alex
parents: 10646
diff changeset
502 #ifdef HAVE_X11
6016
be9cd7d845c2 -zoom, -fs with x[11|mga|v] fix -- round two
pontscho
parents: 6015
diff changeset
503 #ifdef HAVE_NEW_GUI
be9cd7d845c2 -zoom, -fs with x[11|mga|v] fix -- round two
pontscho
parents: 6015
diff changeset
504 if ( !use_gui )
be9cd7d845c2 -zoom, -fs with x[11|mga|v] fix -- round two
pontscho
parents: 6015
diff changeset
505 #endif
6015
04fe086ae486 vo_uninit fixed
arpi
parents: 6013
diff changeset
506 vo_uninit(); // close the X11 connection (if any opened)
04fe086ae486 vo_uninit fixed
arpi
parents: 6013
diff changeset
507 #endif
1723
5e4214a7540e GUI stuff. now seeking works, and xmga renders to video window
arpi
parents: 1709
diff changeset
508
13956
5d8f11a627ae free freetype descriptor and library and mconfig data right before exit
iive
parents: 13946
diff changeset
509 #ifdef HAVE_FREETYPE
5d8f11a627ae free freetype descriptor and library and mconfig data right before exit
iive
parents: 13946
diff changeset
510 current_module="uninit_font";
5d8f11a627ae free freetype descriptor and library and mconfig data right before exit
iive
parents: 13946
diff changeset
511 if (vo_font) free_font_desc(vo_font);
5d8f11a627ae free freetype descriptor and library and mconfig data right before exit
iive
parents: 13946
diff changeset
512 vo_font = NULL;
5d8f11a627ae free freetype descriptor and library and mconfig data right before exit
iive
parents: 13946
diff changeset
513 done_freetype();
5d8f11a627ae free freetype descriptor and library and mconfig data right before exit
iive
parents: 13946
diff changeset
514 #endif
16036
ab9b25d60934 Fix few memleaks on exit.
iive
parents: 15895
diff changeset
515 free_osd_list();
13956
5d8f11a627ae free freetype descriptor and library and mconfig data right before exit
iive
parents: 13946
diff changeset
516
1856
52fc1dc76652 uninit fixed
arpi
parents: 1852
diff changeset
517 current_module="exit_player";
1156
5dc01778e055 has_audio checkings at reset and exit added
al3x
parents: 1125
diff changeset
518
13956
5d8f11a627ae free freetype descriptor and library and mconfig data right before exit
iive
parents: 13946
diff changeset
519 // free mplayer config
16036
ab9b25d60934 Fix few memleaks on exit.
iive
parents: 15895
diff changeset
520 if(mconfig)
ab9b25d60934 Fix few memleaks on exit.
iive
parents: 15895
diff changeset
521 m_config_free(mconfig);
ab9b25d60934 Fix few memleaks on exit.
iive
parents: 15895
diff changeset
522
ab9b25d60934 Fix few memleaks on exit.
iive
parents: 15895
diff changeset
523 if(playtree)
ab9b25d60934 Fix few memleaks on exit.
iive
parents: 15895
diff changeset
524 play_tree_free(playtree, 1);
ab9b25d60934 Fix few memleaks on exit.
iive
parents: 15895
diff changeset
525
13956
5d8f11a627ae free freetype descriptor and library and mconfig data right before exit
iive
parents: 13946
diff changeset
526
13358
567875b88aab Hardcoded EDL messages moved to help_mp-en.h, Doxygen comments added, patch
diego
parents: 13353
diff changeset
527 #ifdef USE_EDL
567875b88aab Hardcoded EDL messages moved to help_mp-en.h, Doxygen comments added, patch
diego
parents: 13353
diff changeset
528 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
529 #endif
13122
fcce0023bf55 printf -> mp_msg conversion, first steps
diego
parents: 13116
diff changeset
530 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
531 mp_msg(MSGT_CPLAYER,MSGL_DBG2,"max framesize was %d bytes\n",max_framesize);
1639
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
532
8644
0bfd73828e33 This patch fixes so that the exit code (or return code if you like) is set
arpi
parents: 8635
diff changeset
533 exit(rc);
0bfd73828e33 This patch fixes so that the exit code (or return code if you like) is set
arpi
parents: 8635
diff changeset
534 }
0bfd73828e33 This patch fixes so that the exit code (or return code if you like) is set
arpi
parents: 8635
diff changeset
535
0bfd73828e33 This patch fixes so that the exit code (or return code if you like) is set
arpi
parents: 8635
diff changeset
536 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
537 exit_player_with_rc(how, 1);
1156
5dc01778e055 has_audio checkings at reset and exit added
al3x
parents: 1125
diff changeset
538 }
5dc01778e055 has_audio checkings at reset and exit added
al3x
parents: 1125
diff changeset
539
13391
b6c3752d9544 handle sigchld in mplayer.c
faust3
parents: 13358
diff changeset
540 #ifndef __MINGW32__
b6c3752d9544 handle sigchld in mplayer.c
faust3
parents: 13358
diff changeset
541 static void child_sighandler(int x){
b6c3752d9544 handle sigchld in mplayer.c
faust3
parents: 13358
diff changeset
542 pid_t pid;
b6c3752d9544 handle sigchld in mplayer.c
faust3
parents: 13358
diff changeset
543 while((pid=waitpid(-1,NULL,WNOHANG)) > 0);
b6c3752d9544 handle sigchld in mplayer.c
faust3
parents: 13358
diff changeset
544 }
b6c3752d9544 handle sigchld in mplayer.c
faust3
parents: 13358
diff changeset
545 #endif
b6c3752d9544 handle sigchld in mplayer.c
faust3
parents: 13358
diff changeset
546
13794
fb83e23e94ce Allow attaching gdb on crash automatically.
reimar
parents: 13773
diff changeset
547 #ifdef CRASH_DEBUG
fb83e23e94ce Allow attaching gdb on crash automatically.
reimar
parents: 13773
diff changeset
548 static char *prog_path;
fb83e23e94ce Allow attaching gdb on crash automatically.
reimar
parents: 13773
diff changeset
549 static int crash_debug = 0;
fb83e23e94ce Allow attaching gdb on crash automatically.
reimar
parents: 13773
diff changeset
550 #endif
fb83e23e94ce Allow attaching gdb on crash automatically.
reimar
parents: 13773
diff changeset
551
7559
b645204ea527 some cleanup - made private vars/funcs static, removed obsolete externs
arpi
parents: 7529
diff changeset
552 static void exit_sighandler(int x){
1156
5dc01778e055 has_audio checkings at reset and exit added
al3x
parents: 1125
diff changeset
553 static int sig_count=0;
13794
fb83e23e94ce Allow attaching gdb on crash automatically.
reimar
parents: 13773
diff changeset
554 #ifdef CRASH_DEBUG
fb83e23e94ce Allow attaching gdb on crash automatically.
reimar
parents: 13773
diff changeset
555 if (!crash_debug || x != SIGTRAP)
fb83e23e94ce Allow attaching gdb on crash automatically.
reimar
parents: 13773
diff changeset
556 #endif
1156
5dc01778e055 has_audio checkings at reset and exit added
al3x
parents: 1125
diff changeset
557 ++sig_count;
13298
a7bde33bd7d8 Don't leave a messed up terminal after a crash
rtognimp
parents: 13269
diff changeset
558 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
559 if(sig_count==5)
a7bde33bd7d8 Don't leave a messed up terminal after a crash
rtognimp
parents: 13269
diff changeset
560 {
a7bde33bd7d8 Don't leave a messed up terminal after a crash
rtognimp
parents: 13269
diff changeset
561 /* 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
562 * by popular request, we make one last (dirty)
a7bde33bd7d8 Don't leave a messed up terminal after a crash
rtognimp
parents: 13269
diff changeset
563 * effort to restore the user's
a7bde33bd7d8 Don't leave a messed up terminal after a crash
rtognimp
parents: 13269
diff changeset
564 * terminal. */
a7bde33bd7d8 Don't leave a messed up terminal after a crash
rtognimp
parents: 13269
diff changeset
565 getch2_disable();
a7bde33bd7d8 Don't leave a messed up terminal after a crash
rtognimp
parents: 13269
diff changeset
566 exit(1);
a7bde33bd7d8 Don't leave a messed up terminal after a crash
rtognimp
parents: 13269
diff changeset
567 }
a7bde33bd7d8 Don't leave a messed up terminal after a crash
rtognimp
parents: 13269
diff changeset
568 if(sig_count==6) exit(1);
a7bde33bd7d8 Don't leave a messed up terminal after a crash
rtognimp
parents: 13269
diff changeset
569 if(sig_count>6){
1156
5dc01778e055 has_audio checkings at reset and exit added
al3x
parents: 1125
diff changeset
570 // can't stop :(
9831
0397b461f0fb MINGW32 port and select()less fifocode by Arpi
faust3
parents: 9752
diff changeset
571 #ifndef __MINGW32__
1156
5dc01778e055 has_audio checkings at reset and exit added
al3x
parents: 1125
diff changeset
572 kill(getpid(),SIGKILL);
9831
0397b461f0fb MINGW32 port and select()less fifocode by Arpi
faust3
parents: 9752
diff changeset
573 #endif
1156
5dc01778e055 has_audio checkings at reset and exit added
al3x
parents: 1125
diff changeset
574 }
5127
621a68b911a9 hints on RTFM
arpi
parents: 5112
diff changeset
575 mp_msg(MSGT_CPLAYER,MSGL_FATAL,"\n" MSGTR_IntBySignal,x,
5106
40d2bcb1b671 using mp_gettext
alex
parents: 5091
diff changeset
576 current_module?current_module:mp_gettext("unknown")
1156
5dc01778e055 has_audio checkings at reset and exit added
al3x
parents: 1125
diff changeset
577 );
16522
49ef03cb382a Prints -identify output for:
gpoirier
parents: 16490
diff changeset
578 if (identify)
49ef03cb382a Prints -identify output for:
gpoirier
parents: 16490
diff changeset
579 mp_msg(MSGT_GLOBAL, MSGL_INFO, "ID_SIGNAL=%d\n", x);
13794
fb83e23e94ce Allow attaching gdb on crash automatically.
reimar
parents: 13773
diff changeset
580 if(sig_count<=1)
5127
621a68b911a9 hints on RTFM
arpi
parents: 5112
diff changeset
581 switch(x){
621a68b911a9 hints on RTFM
arpi
parents: 5112
diff changeset
582 case SIGINT:
621a68b911a9 hints on RTFM
arpi
parents: 5112
diff changeset
583 case SIGQUIT:
621a68b911a9 hints on RTFM
arpi
parents: 5112
diff changeset
584 case SIGTERM:
621a68b911a9 hints on RTFM
arpi
parents: 5112
diff changeset
585 case SIGKILL:
621a68b911a9 hints on RTFM
arpi
parents: 5112
diff changeset
586 break; // killed from keyboard (^C) or killed [-9]
621a68b911a9 hints on RTFM
arpi
parents: 5112
diff changeset
587 case SIGILL:
5129
7de3c4209461 rtfm hint msg depends on runtime detection
arpi
parents: 5127
diff changeset
588 #ifdef RUNTIME_CPUDETECT
8913
f01a53c8de14 Signal handler messages moved to help_mp, so they can be translated
rtognimp
parents: 8819
diff changeset
589 mp_msg(MSGT_CPLAYER,MSGL_FATAL,MSGTR_Exit_SIGILL_RTCpuSel);
5129
7de3c4209461 rtfm hint msg depends on runtime detection
arpi
parents: 5127
diff changeset
590 #else
8913
f01a53c8de14 Signal handler messages moved to help_mp, so they can be translated
rtognimp
parents: 8819
diff changeset
591 mp_msg(MSGT_CPLAYER,MSGL_FATAL,MSGTR_Exit_SIGILL);
5129
7de3c4209461 rtfm hint msg depends on runtime detection
arpi
parents: 5127
diff changeset
592 #endif
5127
621a68b911a9 hints on RTFM
arpi
parents: 5112
diff changeset
593 case SIGFPE:
621a68b911a9 hints on RTFM
arpi
parents: 5112
diff changeset
594 case SIGSEGV:
8913
f01a53c8de14 Signal handler messages moved to help_mp, so they can be translated
rtognimp
parents: 8819
diff changeset
595 mp_msg(MSGT_CPLAYER,MSGL_FATAL,MSGTR_Exit_SIGSEGV_SIGFPE);
5127
621a68b911a9 hints on RTFM
arpi
parents: 5112
diff changeset
596 default:
8913
f01a53c8de14 Signal handler messages moved to help_mp, so they can be translated
rtognimp
parents: 8819
diff changeset
597 mp_msg(MSGT_CPLAYER,MSGL_FATAL,MSGTR_Exit_SIGCRASH);
13794
fb83e23e94ce Allow attaching gdb on crash automatically.
reimar
parents: 13773
diff changeset
598 #ifdef CRASH_DEBUG
fb83e23e94ce Allow attaching gdb on crash automatically.
reimar
parents: 13773
diff changeset
599 if (crash_debug) {
fb83e23e94ce Allow attaching gdb on crash automatically.
reimar
parents: 13773
diff changeset
600 int gdb_pid;
fb83e23e94ce Allow attaching gdb on crash automatically.
reimar
parents: 13773
diff changeset
601 char spid[20];
fb83e23e94ce Allow attaching gdb on crash automatically.
reimar
parents: 13773
diff changeset
602 snprintf(spid, 19, "%i", getpid());
fb83e23e94ce Allow attaching gdb on crash automatically.
reimar
parents: 13773
diff changeset
603 spid[19] = 0;
fb83e23e94ce Allow attaching gdb on crash automatically.
reimar
parents: 13773
diff changeset
604 mp_msg(MSGT_CPLAYER, MSGL_INFO, "Forking...\n");
fb83e23e94ce Allow attaching gdb on crash automatically.
reimar
parents: 13773
diff changeset
605 gdb_pid = fork();
fb83e23e94ce Allow attaching gdb on crash automatically.
reimar
parents: 13773
diff changeset
606 mp_msg(MSGT_CPLAYER, MSGL_INFO, "Forked...\n");
fb83e23e94ce Allow attaching gdb on crash automatically.
reimar
parents: 13773
diff changeset
607 if (gdb_pid == 0) { // We are the child
fb83e23e94ce Allow attaching gdb on crash automatically.
reimar
parents: 13773
diff changeset
608 if (execlp("gdb", "gdb", prog_path, spid, NULL) == -1)
fb83e23e94ce Allow attaching gdb on crash automatically.
reimar
parents: 13773
diff changeset
609 mp_msg(MSGT_CPLAYER, MSGL_ERR, "Couldn't start gdb\n");
fb83e23e94ce Allow attaching gdb on crash automatically.
reimar
parents: 13773
diff changeset
610 } else if (gdb_pid < 0)
fb83e23e94ce Allow attaching gdb on crash automatically.
reimar
parents: 13773
diff changeset
611 mp_msg(MSGT_CPLAYER, MSGL_ERR, "Couldn't fork\n");
fb83e23e94ce Allow attaching gdb on crash automatically.
reimar
parents: 13773
diff changeset
612 else {
fb83e23e94ce Allow attaching gdb on crash automatically.
reimar
parents: 13773
diff changeset
613 waitpid(gdb_pid, NULL, 0);
fb83e23e94ce Allow attaching gdb on crash automatically.
reimar
parents: 13773
diff changeset
614 }
fb83e23e94ce Allow attaching gdb on crash automatically.
reimar
parents: 13773
diff changeset
615 if (x == SIGTRAP) return;
fb83e23e94ce Allow attaching gdb on crash automatically.
reimar
parents: 13773
diff changeset
616 }
fb83e23e94ce Allow attaching gdb on crash automatically.
reimar
parents: 13773
diff changeset
617 #endif
5127
621a68b911a9 hints on RTFM
arpi
parents: 5112
diff changeset
618 }
1156
5dc01778e055 has_audio checkings at reset and exit added
al3x
parents: 1125
diff changeset
619 exit_player(NULL);
5dc01778e055 has_audio checkings at reset and exit added
al3x
parents: 1125
diff changeset
620 }
5dc01778e055 has_audio checkings at reset and exit added
al3x
parents: 1125
diff changeset
621
2557
6a74454ea121 some cleanup
arpi
parents: 2550
diff changeset
622 //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
623
7867
3dc0b71630ff cleanup config option handling in libmpdemux.
arpi
parents: 7864
diff changeset
624 extern void mp_input_register_options(m_config_t* cfg);
4659
31265995cc3a Place holder for registering modules options
albeu
parents: 4655
diff changeset
625
459
9dfad88a8107 add mixer support
pontscho
parents: 458
diff changeset
626 #include "mixer.h"
12691
0230544f52a1 Fix GUI compilation, patch by Reimar D«Óffinger and Alexander Strasser.
diego
parents: 12681
diff changeset
627 mixer_t mixer;
13098
907fe1fdfc6c Make the stepsize of volume changes, changeable by a commandline paarameter
attila
parents: 13094
diff changeset
628 /// step size of mixer changes
907fe1fdfc6c Make the stepsize of volume changes, changeable by a commandline paarameter
attila
parents: 13094
diff changeset
629 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
630
147
0a0d7dd8fb51 new command line/config file parser
szabii
parents: 117
diff changeset
631 #include "cfg-mplayer.h"
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
632
4156
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4152
diff changeset
633 void parse_cfgfiles( m_config_t* conf )
723
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
634 {
1014
e01dc1a88edf fixed punkso's mess... local variables moved back to main()
arpi_esp
parents: 1009
diff changeset
635 char *conffile;
e01dc1a88edf fixed punkso's mess... local variables moved back to main()
arpi_esp
parents: 1009
diff changeset
636 int conffile_fd;
10272
7b0bc557987b renames: DATADIR->MPLAYER_DATADIR, CONFDIR->MPLAYER_CONFDIR, LIBDIR->MPLAYER_LIBDIR
arpi
parents: 10240
diff changeset
637 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
638 exit_player(NULL);
178
55206b791586 get_path()
szabii
parents: 175
diff changeset
639 if ((conffile = get_path("")) == NULL) {
1583
ca7bf882d2f8 ehh. mp_msgt->mp_msg
arpi
parents: 1582
diff changeset
640 mp_msg(MSGT_CPLAYER,MSGL_WARN,MSGTR_NoHomeDir);
147
0a0d7dd8fb51 new command line/config file parser
szabii
parents: 117
diff changeset
641 } else {
9831
0397b461f0fb MINGW32 port and select()less fifocode by Arpi
faust3
parents: 9752
diff changeset
642 #ifdef __MINGW32__
0397b461f0fb MINGW32 port and select()less fifocode by Arpi
faust3
parents: 9752
diff changeset
643 mkdir(conffile);
0397b461f0fb MINGW32 port and select()less fifocode by Arpi
faust3
parents: 9752
diff changeset
644 #else
178
55206b791586 get_path()
szabii
parents: 175
diff changeset
645 mkdir(conffile, 0777);
9831
0397b461f0fb MINGW32 port and select()less fifocode by Arpi
faust3
parents: 9752
diff changeset
646 #endif
178
55206b791586 get_path()
szabii
parents: 175
diff changeset
647 free(conffile);
55206b791586 get_path()
szabii
parents: 175
diff changeset
648 if ((conffile = get_path("config")) == NULL) {
1583
ca7bf882d2f8 ehh. mp_msgt->mp_msg
arpi
parents: 1582
diff changeset
649 mp_msg(MSGT_CPLAYER,MSGL_ERR,MSGTR_GetpathProblem);
178
55206b791586 get_path()
szabii
parents: 175
diff changeset
650 } else {
55206b791586 get_path()
szabii
parents: 175
diff changeset
651 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
652 mp_msg(MSGT_CPLAYER,MSGL_INFO,MSGTR_CreatingCfgFile, conffile);
178
55206b791586 get_path()
szabii
parents: 175
diff changeset
653 write(conffile_fd, default_config, strlen(default_config));
55206b791586 get_path()
szabii
parents: 175
diff changeset
654 close(conffile_fd);
55206b791586 get_path()
szabii
parents: 175
diff changeset
655 }
4156
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4152
diff changeset
656 if (m_config_parse_config_file(conf, conffile) < 0)
13500
77b3bc17d764 make sure exit_player gets called
joey
parents: 13391
diff changeset
657 exit_player(NULL);
178
55206b791586 get_path()
szabii
parents: 175
diff changeset
658 free(conffile);
151
9708d4b2765b cfgparser fix
szabii
parents: 150
diff changeset
659 }
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
660 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
661 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
662
8614
49e36bf2f342 The patch adds support for a per-file config, which is loaded before
arpi
parents: 8612
diff changeset
663 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
664 {
49e36bf2f342 The patch adds support for a per-file config, which is loaded before
arpi
parents: 8612
diff changeset
665 char *confpath;
8634
a8c4246b6869 PATH_MAX fixed
arpi
parents: 8627
diff changeset
666 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
667 struct stat st;
49e36bf2f342 The patch adds support for a per-file config, which is loaded before
arpi
parents: 8612
diff changeset
668 char *name;
49e36bf2f342 The patch adds support for a per-file config, which is loaded before
arpi
parents: 8612
diff changeset
669
49e36bf2f342 The patch adds support for a per-file config, which is loaded before
arpi
parents: 8612
diff changeset
670 sprintf (cfg, "%s.conf", file);
49e36bf2f342 The patch adds support for a per-file config, which is loaded before
arpi
parents: 8612
diff changeset
671
49e36bf2f342 The patch adds support for a per-file config, which is loaded before
arpi
parents: 8612
diff changeset
672 if (!stat (cfg, &st))
49e36bf2f342 The patch adds support for a per-file config, which is loaded before
arpi
parents: 8612
diff changeset
673 {
13577
606d90e03a2f printf --> mp_msg conversion
diego
parents: 13502
diff changeset
674 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
675 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
676 return;
49e36bf2f342 The patch adds support for a per-file config, which is loaded before
arpi
parents: 8612
diff changeset
677 }
49e36bf2f342 The patch adds support for a per-file config, which is loaded before
arpi
parents: 8612
diff changeset
678
49e36bf2f342 The patch adds support for a per-file config, which is loaded before
arpi
parents: 8612
diff changeset
679 if ((name = strrchr (cfg, '/')) == NULL)
49e36bf2f342 The patch adds support for a per-file config, which is loaded before
arpi
parents: 8612
diff changeset
680 name = cfg;
49e36bf2f342 The patch adds support for a per-file config, which is loaded before
arpi
parents: 8612
diff changeset
681 else
49e36bf2f342 The patch adds support for a per-file config, which is loaded before
arpi
parents: 8612
diff changeset
682 name++;
49e36bf2f342 The patch adds support for a per-file config, which is loaded before
arpi
parents: 8612
diff changeset
683
49e36bf2f342 The patch adds support for a per-file config, which is loaded before
arpi
parents: 8612
diff changeset
684 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
685 {
49e36bf2f342 The patch adds support for a per-file config, which is loaded before
arpi
parents: 8612
diff changeset
686 if (!stat (confpath, &st))
49e36bf2f342 The patch adds support for a per-file config, which is loaded before
arpi
parents: 8612
diff changeset
687 {
13577
606d90e03a2f printf --> mp_msg conversion
diego
parents: 13502
diff changeset
688 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
689 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
690 }
49e36bf2f342 The patch adds support for a per-file config, which is loaded before
arpi
parents: 8612
diff changeset
691
49e36bf2f342 The patch adds support for a per-file config, which is loaded before
arpi
parents: 8612
diff changeset
692 free (confpath);
49e36bf2f342 The patch adds support for a per-file config, which is loaded before
arpi
parents: 8612
diff changeset
693 }
49e36bf2f342 The patch adds support for a per-file config, which is loaded before
arpi
parents: 8612
diff changeset
694 }
49e36bf2f342 The patch adds support for a per-file config, which is loaded before
arpi
parents: 8612
diff changeset
695
4825
41d2da3bd082 Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents: 4818
diff changeset
696 // 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
697 // 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
698 // The function return a new value for eof.
41d2da3bd082 Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents: 4818
diff changeset
699 static int libmpdemux_was_interrupted(int eof) {
41d2da3bd082 Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents: 4818
diff changeset
700 mp_cmd_t* cmd;
13603
80fc8f48f14c Do not loose commands while paused.
reimar
parents: 13577
diff changeset
701 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
702 switch(cmd->id) {
41d2da3bd082 Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents: 4818
diff changeset
703 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
704 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
705 case MP_CMD_PLAY_TREE_STEP: {
41d2da3bd082 Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents: 4818
diff changeset
706 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
707 } break;
41d2da3bd082 Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents: 4818
diff changeset
708 case MP_CMD_PLAY_TREE_UP_STEP: {
41d2da3bd082 Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents: 4818
diff changeset
709 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
710 } break;
41d2da3bd082 Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents: 4818
diff changeset
711 case MP_CMD_PLAY_ALT_SRC_STEP: {
41d2da3bd082 Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents: 4818
diff changeset
712 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
713 } break;
41d2da3bd082 Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents: 4818
diff changeset
714 }
41d2da3bd082 Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents: 4818
diff changeset
715 mp_cmd_free(cmd);
41d2da3bd082 Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents: 4818
diff changeset
716 }
41d2da3bd082 Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents: 4818
diff changeset
717 return eof;
41d2da3bd082 Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents: 4818
diff changeset
718 }
41d2da3bd082 Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents: 4818
diff changeset
719
13010
047bbb973011 windows path seperator fixes
joey
parents: 12981
diff changeset
720 #define mp_basename2(s) (strrchr(s,'/')==NULL?(char*)s:(strrchr(s,'/')+1))
047bbb973011 windows path seperator fixes
joey
parents: 12981
diff changeset
721 #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
722
8925
5c15777f1c07 this patch adds an fallback to playlist (any but the plaintext-list format)
arpi
parents: 8913
diff changeset
723 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
724 {
9301
7841308ad250 this patch fixes latest bug, discovered by .so ... (relative filenames &
arpi
parents: 9291
diff changeset
725 play_tree_add_bpf(entry,filename);
7841308ad250 this patch fixes latest bug, discovered by .so ... (relative filenames &
arpi
parents: 9291
diff changeset
726
9291
64b8c5a07c2c - It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents: 9217
diff changeset
727 #ifdef HAVE_NEW_GUI
64b8c5a07c2c - It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents: 9217
diff changeset
728 if (use_gui) {
64b8c5a07c2c - It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents: 9217
diff changeset
729 if (entry) {
64b8c5a07c2c - It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents: 9217
diff changeset
730 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
731 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
732 }
64b8c5a07c2c - It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents: 9217
diff changeset
733 } else
64b8c5a07c2c - It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents: 9217
diff changeset
734 #endif
64b8c5a07c2c - It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents: 9217
diff changeset
735 {
8925
5c15777f1c07 this patch adds an fallback to playlist (any but the plaintext-list format)
arpi
parents: 8913
diff changeset
736 if(!entry) {
5c15777f1c07 this patch adds an fallback to playlist (any but the plaintext-list format)
arpi
parents: 8913
diff changeset
737 entry = playtree_iter->tree;
5c15777f1c07 this patch adds an fallback to playlist (any but the plaintext-list format)
arpi
parents: 8913
diff changeset
738 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
739 return PT_NEXT_ENTRY;
5c15777f1c07 this patch adds an fallback to playlist (any but the plaintext-list format)
arpi
parents: 8913
diff changeset
740 }
5c15777f1c07 this patch adds an fallback to playlist (any but the plaintext-list format)
arpi
parents: 8913
diff changeset
741 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
742 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
743 return PT_NEXT_ENTRY;
5c15777f1c07 this patch adds an fallback to playlist (any but the plaintext-list format)
arpi
parents: 8913
diff changeset
744 }
5c15777f1c07 this patch adds an fallback to playlist (any but the plaintext-list format)
arpi
parents: 8913
diff changeset
745 }
5c15777f1c07 this patch adds an fallback to playlist (any but the plaintext-list format)
arpi
parents: 8913
diff changeset
746 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
747 return PT_NEXT_SRC;
5c15777f1c07 this patch adds an fallback to playlist (any but the plaintext-list format)
arpi
parents: 8913
diff changeset
748 }
5c15777f1c07 this patch adds an fallback to playlist (any but the plaintext-list format)
arpi
parents: 8913
diff changeset
749 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
750 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
751 entry = playtree_iter->tree;
5c15777f1c07 this patch adds an fallback to playlist (any but the plaintext-list format)
arpi
parents: 8913
diff changeset
752 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
753 return PT_NEXT_ENTRY;
5c15777f1c07 this patch adds an fallback to playlist (any but the plaintext-list format)
arpi
parents: 8913
diff changeset
754 }
5c15777f1c07 this patch adds an fallback to playlist (any but the plaintext-list format)
arpi
parents: 8913
diff changeset
755 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
756 }
8925
5c15777f1c07 this patch adds an fallback to playlist (any but the plaintext-list format)
arpi
parents: 8913
diff changeset
757 return PT_NEXT_SRC;
5c15777f1c07 this patch adds an fallback to playlist (any but the plaintext-list format)
arpi
parents: 8913
diff changeset
758 }
5c15777f1c07 this patch adds an fallback to playlist (any but the plaintext-list format)
arpi
parents: 8913
diff changeset
759
8198
1935017c0f71 Experimantal OSD menu
albeu
parents: 8164
diff changeset
760 static int play_tree_step = 1;
1935017c0f71 Experimantal OSD menu
albeu
parents: 8164
diff changeset
761
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
762 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
763 {
a5004eb92a79 fix sub_select fiasco with global sub numbering. now multiple sub sources can be managed in essentially one list.
joey
parents: 13500
diff changeset
764 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
765 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
766 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
767 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
768 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
769 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
770 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
771 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
772 }
a5004eb92a79 fix sub_select fiasco with global sub numbering. now multiple sub sources can be managed in essentially one list.
joey
parents: 13500
diff changeset
773 }
a5004eb92a79 fix sub_select fiasco with global sub numbering. now multiple sub sources can be managed in essentially one list.
joey
parents: 13500
diff changeset
774 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
775 }
a5004eb92a79 fix sub_select fiasco with global sub numbering. now multiple sub sources can be managed in essentially one list.
joey
parents: 13500
diff changeset
776
9870
09d630a4f991 support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents: 9831
diff changeset
777 #ifdef USE_SUB
09d630a4f991 support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents: 9831
diff changeset
778
09d630a4f991 support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents: 9831
diff changeset
779 sub_data* subdata = NULL;
14684
a4767edef10d command to log current subtitle to file
henry
parents: 14644
diff changeset
780 static subtitle* vo_sub_last = NULL;
9870
09d630a4f991 support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents: 9831
diff changeset
781
09d630a4f991 support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents: 9831
diff changeset
782 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
783 {
09d630a4f991 support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents: 9831
diff changeset
784 sub_data *subd;
09d630a4f991 support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents: 9831
diff changeset
785
09d630a4f991 support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents: 9831
diff changeset
786 if (filename == NULL) {
09d630a4f991 support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents: 9831
diff changeset
787 return;
09d630a4f991 support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents: 9831
diff changeset
788 }
09d630a4f991 support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents: 9831
diff changeset
789
09d630a4f991 support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents: 9831
diff changeset
790 subd = sub_read_file(filename, fps);
09d630a4f991 support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents: 9831
diff changeset
791 if(!subd && !silent)
09d630a4f991 support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents: 9831
diff changeset
792 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
793 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
794 set_of_subtitles[set_of_sub_size] = subd;
14046
4802041ab8e3 Output more information about vids, aids, sids, alangs and slangs with -identify. Patch by kiriuja <mplayer-patches@en-directo.net>
mosu
parents: 13991
diff changeset
795 if (identify)
4802041ab8e3 Output more information about vids, aids, sids, alangs and slangs with -identify. Patch by kiriuja <mplayer-patches@en-directo.net>
mosu
parents: 13991
diff changeset
796 {
4802041ab8e3 Output more information about vids, aids, sids, alangs and slangs with -identify. Patch by kiriuja <mplayer-patches@en-directo.net>
mosu
parents: 13991
diff changeset
797 mp_msg(MSGT_GLOBAL, MSGL_INFO, "ID_FILE_SUB_ID=%d\n", set_of_sub_size);
4802041ab8e3 Output more information about vids, aids, sids, alangs and slangs with -identify. Patch by kiriuja <mplayer-patches@en-directo.net>
mosu
parents: 13991
diff changeset
798 mp_msg(MSGT_GLOBAL, MSGL_INFO, "ID_FILE_SUB_FILENAME=%s\n", filename);
4802041ab8e3 Output more information about vids, aids, sids, alangs and slangs with -identify. Patch by kiriuja <mplayer-patches@en-directo.net>
mosu
parents: 13991
diff changeset
799 }
9870
09d630a4f991 support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents: 9831
diff changeset
800 ++set_of_sub_size;
14241
ad4dd100472e Set message level of the added subtitle message to INFO, fixes bug #139
reimar
parents: 14197
diff changeset
801 mp_msg(MSGT_CPLAYER, MSGL_INFO, MSGTR_AddedSubtitleFile, set_of_sub_size, filename);
9870
09d630a4f991 support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents: 9831
diff changeset
802 }
09d630a4f991 support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents: 9831
diff changeset
803
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
804 // 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
805 void update_set_of_subtitles()
09d630a4f991 support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents: 9831
diff changeset
806 // 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
807 {
09d630a4f991 support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents: 9831
diff changeset
808 int i;
09d630a4f991 support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents: 9831
diff changeset
809 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
810 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
811 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
812 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
813 --set_of_sub_size;
09d630a4f991 support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents: 9831
diff changeset
814 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
815 }
09d630a4f991 support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents: 9831
diff changeset
816 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
817 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
818 }
09d630a4f991 support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents: 9831
diff changeset
819 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
820 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
821 ++set_of_sub_size;
09d630a4f991 support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents: 9831
diff changeset
822 }
09d630a4f991 support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents: 9831
diff changeset
823 }
16490
f17b3c152fd6 Add comments to a few #endif statements in order to make clear which
diego
parents: 16489
diff changeset
824 #endif /* USE_SUB */
9870
09d630a4f991 support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents: 9831
diff changeset
825
7201
22beff6edf75 Improved MacOS X SDL support, enable SDL main() wrapper for Darwin, remove unused envp.
atmos4
parents: 7191
diff changeset
826 /*
22beff6edf75 Improved MacOS X SDL support, enable SDL main() wrapper for Darwin, remove unused envp.
atmos4
parents: 7191
diff changeset
827 * 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
828 * 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
829 * 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
830 */
22beff6edf75 Improved MacOS X SDL support, enable SDL main() wrapper for Darwin, remove unused envp.
atmos4
parents: 7191
diff changeset
831 #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
832 #include <SDL.h>
22beff6edf75 Improved MacOS X SDL support, enable SDL main() wrapper for Darwin, remove unused envp.
atmos4
parents: 7191
diff changeset
833 #endif
22beff6edf75 Improved MacOS X SDL support, enable SDL main() wrapper for Darwin, remove unused envp.
atmos4
parents: 7191
diff changeset
834
13710
d7af73cc38da allow changing playback speed during playback.
reimar
parents: 13684
diff changeset
835 /**
13857
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
836 * \brief append a formatted string
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
837 * \param buf buffer to print into
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
838 * \param pos position of terminating 0 in buf
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
839 * \param len maximum number of characters in buf, not including terminating 0
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
840 * \param format printf format string
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
841 */
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
842 static void saddf(char *buf, unsigned *pos, int len, const char *format, ...)
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
843 {
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
844 va_list va;
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
845 va_start(va, format);
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
846 *pos += vsnprintf(&buf[*pos], len - *pos, format, va);
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
847 va_end(va);
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
848 if (*pos >= len ) {
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
849 buf[len] = 0;
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
850 *pos = len;
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
851 }
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
852 }
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
853
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
854 /**
16654
7658dde0777b Show total time when playing audio-only files
reimar
parents: 16522
diff changeset
855 * \brief append time in the hh:mm:ss.f format
7658dde0777b Show total time when playing audio-only files
reimar
parents: 16522
diff changeset
856 * \param buf buffer to print into
7658dde0777b Show total time when playing audio-only files
reimar
parents: 16522
diff changeset
857 * \param pos position of terminating 0 in buf
7658dde0777b Show total time when playing audio-only files
reimar
parents: 16522
diff changeset
858 * \param len maximum number of characters in buf, not including terminating 0
7658dde0777b Show total time when playing audio-only files
reimar
parents: 16522
diff changeset
859 * \param time time value to convert/append
7658dde0777b Show total time when playing audio-only files
reimar
parents: 16522
diff changeset
860 */
7658dde0777b Show total time when playing audio-only files
reimar
parents: 16522
diff changeset
861 static void sadd_hhmmssf(char *buf, unsigned *pos, int len, float time) {
7658dde0777b Show total time when playing audio-only files
reimar
parents: 16522
diff changeset
862 long tenths = 10 * time;
7658dde0777b Show total time when playing audio-only files
reimar
parents: 16522
diff changeset
863 int f1 = tenths % 10;
7658dde0777b Show total time when playing audio-only files
reimar
parents: 16522
diff changeset
864 int ss = (tenths / 10) % 60;
7658dde0777b Show total time when playing audio-only files
reimar
parents: 16522
diff changeset
865 int mm = (tenths / 600) % 60;
7658dde0777b Show total time when playing audio-only files
reimar
parents: 16522
diff changeset
866 int hh = tenths / 36000;
7658dde0777b Show total time when playing audio-only files
reimar
parents: 16522
diff changeset
867 if (time <= 0) {
7658dde0777b Show total time when playing audio-only files
reimar
parents: 16522
diff changeset
868 saddf(buf, pos, len, "unknown");
7658dde0777b Show total time when playing audio-only files
reimar
parents: 16522
diff changeset
869 return;
7658dde0777b Show total time when playing audio-only files
reimar
parents: 16522
diff changeset
870 }
7658dde0777b Show total time when playing audio-only files
reimar
parents: 16522
diff changeset
871 if (hh > 0)
7658dde0777b Show total time when playing audio-only files
reimar
parents: 16522
diff changeset
872 saddf(buf, pos, len, "%2d:", hh);
7658dde0777b Show total time when playing audio-only files
reimar
parents: 16522
diff changeset
873 if (hh > 0 || mm > 0)
7658dde0777b Show total time when playing audio-only files
reimar
parents: 16522
diff changeset
874 saddf(buf, pos, len, "%02d:", mm);
7658dde0777b Show total time when playing audio-only files
reimar
parents: 16522
diff changeset
875 saddf(buf, pos, len, "%02d.%1d", ss, f1);
7658dde0777b Show total time when playing audio-only files
reimar
parents: 16522
diff changeset
876 }
7658dde0777b Show total time when playing audio-only files
reimar
parents: 16522
diff changeset
877
7658dde0777b Show total time when playing audio-only files
reimar
parents: 16522
diff changeset
878 /**
13857
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
879 * \brief print the status line
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
880 * \param a_pos audio position
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
881 * \param a_v A-V desynchronization
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
882 * \param corr amount out A-V synchronization
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
883 */
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
884 static void print_status(float a_pos, float a_v, float corr)
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
885 {
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
886 int width;
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
887 char *line;
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
888 unsigned pos = 0;
13906
db2f1e657dfe use get_screen_size from getch2.c instead of ioctl, fixes bug #131.
reimar
parents: 13893
diff changeset
889 get_screen_size();
db2f1e657dfe use get_screen_size from getch2.c instead of ioctl, fixes bug #131.
reimar
parents: 13893
diff changeset
890 if (screen_width > 0)
db2f1e657dfe use get_screen_size from getch2.c instead of ioctl, fixes bug #131.
reimar
parents: 13893
diff changeset
891 width = screen_width;
13857
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
892 else
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
893 width = 80;
13928
6a0b5d320378 fix scrolling status line in windows
reimar
parents: 13906
diff changeset
894 #ifdef WIN32
6a0b5d320378 fix scrolling status line in windows
reimar
parents: 13906
diff changeset
895 // windows command line is broken (MinGW's rxvt works though, but we
6a0b5d320378 fix scrolling status line in windows
reimar
parents: 13906
diff changeset
896 // should not depend on that).
6a0b5d320378 fix scrolling status line in windows
reimar
parents: 13906
diff changeset
897 width--;
6a0b5d320378 fix scrolling status line in windows
reimar
parents: 13906
diff changeset
898 #endif
13857
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
899 line = malloc(width + 1); // one additional for terminating null
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
900
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
901 // Audio time
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
902 if (sh_audio) {
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
903 saddf(line, &pos, width, "A:%6.1f ", a_pos);
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
904 if (!sh_video) {
16654
7658dde0777b Show total time when playing audio-only files
reimar
parents: 16522
diff changeset
905 float len = demuxer_get_time_length(demuxer);
13857
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
906 saddf(line, &pos, width, "(");
16654
7658dde0777b Show total time when playing audio-only files
reimar
parents: 16522
diff changeset
907 sadd_hhmmssf(line, &pos, width, a_pos);
7658dde0777b Show total time when playing audio-only files
reimar
parents: 16522
diff changeset
908 saddf(line, &pos, width, ") of %.1f (", len);
7658dde0777b Show total time when playing audio-only files
reimar
parents: 16522
diff changeset
909 sadd_hhmmssf(line, &pos, width, len);
16742
2d8ace98bb6d Missing space in status line
reimar
parents: 16740
diff changeset
910 saddf(line, &pos, width, ") ");
13857
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
911 }
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
912 }
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
913
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
914 // Video time
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
915 if (sh_video)
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
916 saddf(line, &pos, width, "V:%6.1f ", sh_video->pts);
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
917
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
918 // A-V sync
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
919 if (sh_audio && sh_video)
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
920 saddf(line, &pos, width, "A-V:%7.3f ct:%7.3f ", a_v, corr);
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
921
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
922 // Video stats
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
923 if (sh_video)
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
924 saddf(line, &pos, width, "%3d/%3d ",
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
925 (int)sh_video->num_frames,
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
926 (int)sh_video->num_frames_decoded);
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
927
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
928 // CPU usage
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
929 if (sh_video) {
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
930 if (sh_video->timer > 0.5)
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
931 saddf(line, &pos, width, "%2d%% %2d%% %4.1f%% ",
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
932 (int)(100.0*video_time_usage*playback_speed/(double)sh_video->timer),
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
933 (int)(100.0*vout_time_usage*playback_speed/(double)sh_video->timer),
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
934 (100.0*audio_time_usage*playback_speed/(double)sh_video->timer));
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
935 else
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
936 saddf(line, &pos, width, "??%% ??%% ??,?%% ");
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
937 } else if (sh_audio) {
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
938 if (sh_audio->delay > 0.5)
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
939 saddf(line, &pos, width, "%4.1f%% ",
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
940 100.0*audio_time_usage/(double)sh_audio->delay);
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
941 else
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
942 saddf(line, &pos, width, "??,?%% ");
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
943 }
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
944
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
945 // VO stats
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
946 if (sh_video)
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
947 saddf(line, &pos, width, "%d %d ", drop_frame_cnt, output_quality);
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
948
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
949 #ifdef USE_STREAM_CACHE
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
950 // cache stats
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
951 if (stream_cache_size > 0)
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
952 saddf(line, &pos, width, "%d%% ", cache_fill_status);
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
953 #endif
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
954
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
955 // other
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
956 if (playback_speed != 1)
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
957 saddf(line, &pos, width, "%4.2fx ", playback_speed);
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
958
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
959 // end
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
960 memset(&line[pos], ' ', width - pos);
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
961 line[width] = 0;
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
962 mp_msg(MSGT_AVSYNC, MSGL_STATUS, "%s\r", line);
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
963 free(line);
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
964 }
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
965
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
966 /**
13710
d7af73cc38da allow changing playback speed during playback.
reimar
parents: 13684
diff changeset
967 * \brief build a chain of audio filters that converts the input format
d7af73cc38da allow changing playback speed during playback.
reimar
parents: 13684
diff changeset
968 * to the ao's format, taking into account the current playback_speed.
d7af73cc38da allow changing playback speed during playback.
reimar
parents: 13684
diff changeset
969 * \param sh_audio describes the requested input format of the chain.
d7af73cc38da allow changing playback speed during playback.
reimar
parents: 13684
diff changeset
970 * \param ao_data describes the requested output format of the chain.
d7af73cc38da allow changing playback speed during playback.
reimar
parents: 13684
diff changeset
971 */
d7af73cc38da allow changing playback speed during playback.
reimar
parents: 13684
diff changeset
972 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
973 {
14140
337aa26e20b5 10l, should check for != NULL before using not after...
reimar
parents: 14087
diff changeset
974 int new_srate;
14172
67912fc34e04 Set mixer.afilter at a more appropriate place.
reimar
parents: 14140
diff changeset
975 int result;
13710
d7af73cc38da allow changing playback speed during playback.
reimar
parents: 13684
diff changeset
976 if (!sh_audio)
14172
67912fc34e04 Set mixer.afilter at a more appropriate place.
reimar
parents: 14140
diff changeset
977 {
14254
21e72b6d8d11 Do not use audio plugins anymore
reimar
parents: 14245
diff changeset
978 #ifdef HAVE_NEW_GUI
21e72b6d8d11 Do not use audio plugins anymore
reimar
parents: 14245
diff changeset
979 guiGetEvent(guiSetAfilter, (char *)NULL);
21e72b6d8d11 Do not use audio plugins anymore
reimar
parents: 14245
diff changeset
980 #endif
14172
67912fc34e04 Set mixer.afilter at a more appropriate place.
reimar
parents: 14140
diff changeset
981 mixer.afilter = NULL;
13710
d7af73cc38da allow changing playback speed during playback.
reimar
parents: 13684
diff changeset
982 return 0;
14172
67912fc34e04 Set mixer.afilter at a more appropriate place.
reimar
parents: 14140
diff changeset
983 }
14140
337aa26e20b5 10l, should check for != NULL before using not after...
reimar
parents: 14087
diff changeset
984 new_srate = sh_audio->samplerate * playback_speed;
13710
d7af73cc38da allow changing playback speed during playback.
reimar
parents: 13684
diff changeset
985 if (new_srate != ao_data->samplerate) {
d7af73cc38da allow changing playback speed during playback.
reimar
parents: 13684
diff changeset
986 // limits are taken from libaf/af_resample.c
d7af73cc38da allow changing playback speed during playback.
reimar
parents: 13684
diff changeset
987 if (new_srate < 8000)
d7af73cc38da allow changing playback speed during playback.
reimar
parents: 13684
diff changeset
988 new_srate = 8000;
d7af73cc38da allow changing playback speed during playback.
reimar
parents: 13684
diff changeset
989 if (new_srate > 192000)
d7af73cc38da allow changing playback speed during playback.
reimar
parents: 13684
diff changeset
990 new_srate = 192000;
d7af73cc38da allow changing playback speed during playback.
reimar
parents: 13684
diff changeset
991 playback_speed = (float)new_srate / (float)sh_audio->samplerate;
d7af73cc38da allow changing playback speed during playback.
reimar
parents: 13684
diff changeset
992 }
14172
67912fc34e04 Set mixer.afilter at a more appropriate place.
reimar
parents: 14140
diff changeset
993 result = init_audio_filters(sh_audio, new_srate,
14818
663c1ea5f595 finally remove the refences to bps outside libaf. also simplification of some messages and removed redundants
alex
parents: 14807
diff changeset
994 sh_audio->channels, sh_audio->sample_format,
15811
9b4bbb6098f6 make -srate work again, unify audio filter init and preinit.
reimar
parents: 15789
diff changeset
995 &ao_data->samplerate, &ao_data->channels, &ao_data->format,
13710
d7af73cc38da allow changing playback speed during playback.
reimar
parents: 13684
diff changeset
996 ao_data->outburst * 4, ao_data->buffersize);
14172
67912fc34e04 Set mixer.afilter at a more appropriate place.
reimar
parents: 14140
diff changeset
997 mixer.afilter = sh_audio->afilter;
14254
21e72b6d8d11 Do not use audio plugins anymore
reimar
parents: 14245
diff changeset
998 #ifdef HAVE_NEW_GUI
21e72b6d8d11 Do not use audio plugins anymore
reimar
parents: 14245
diff changeset
999 guiGetEvent(guiSetAfilter, (char *)sh_audio->afilter);
21e72b6d8d11 Do not use audio plugins anymore
reimar
parents: 14245
diff changeset
1000 #endif
14172
67912fc34e04 Set mixer.afilter at a more appropriate place.
reimar
parents: 14140
diff changeset
1001 return result;
13710
d7af73cc38da allow changing playback speed during playback.
reimar
parents: 13684
diff changeset
1002 }
8800
2485bc98772d fixed some possible overflow places
alex
parents: 8784
diff changeset
1003
14684
a4767edef10d command to log current subtitle to file
henry
parents: 14644
diff changeset
1004 #ifdef USE_SUB
a4767edef10d command to log current subtitle to file
henry
parents: 14644
diff changeset
1005 /**
a4767edef10d command to log current subtitle to file
henry
parents: 14644
diff changeset
1006 * \brief Log the currently displayed subtitle to a file
a4767edef10d command to log current subtitle to file
henry
parents: 14644
diff changeset
1007 *
a4767edef10d command to log current subtitle to file
henry
parents: 14644
diff changeset
1008 * Logs the current or last displayed subtitle together with filename
a4767edef10d command to log current subtitle to file
henry
parents: 14644
diff changeset
1009 * and time information to ~/.mplayer/subtitle_log
a4767edef10d command to log current subtitle to file
henry
parents: 14644
diff changeset
1010 *
a4767edef10d command to log current subtitle to file
henry
parents: 14644
diff changeset
1011 * Intended purpose is to allow convenient marking of bogus subtitles
a4767edef10d command to log current subtitle to file
henry
parents: 14644
diff changeset
1012 * which need to be fixed while watching the movie.
a4767edef10d command to log current subtitle to file
henry
parents: 14644
diff changeset
1013 */
a4767edef10d command to log current subtitle to file
henry
parents: 14644
diff changeset
1014
a4767edef10d command to log current subtitle to file
henry
parents: 14644
diff changeset
1015 static void log_sub(){
a4767edef10d command to log current subtitle to file
henry
parents: 14644
diff changeset
1016 char *fname;
a4767edef10d command to log current subtitle to file
henry
parents: 14644
diff changeset
1017 FILE *f;
a4767edef10d command to log current subtitle to file
henry
parents: 14644
diff changeset
1018 int i;
a4767edef10d command to log current subtitle to file
henry
parents: 14644
diff changeset
1019
a4767edef10d command to log current subtitle to file
henry
parents: 14644
diff changeset
1020 if (subdata == NULL || vo_sub_last == NULL) return;
a4767edef10d command to log current subtitle to file
henry
parents: 14644
diff changeset
1021 fname = get_path("subtitle_log");
a4767edef10d command to log current subtitle to file
henry
parents: 14644
diff changeset
1022 f = fopen(fname, "a");
a4767edef10d command to log current subtitle to file
henry
parents: 14644
diff changeset
1023 if (!f) return;
a4767edef10d command to log current subtitle to file
henry
parents: 14644
diff changeset
1024 fprintf(f, "----------------------------------------------------------\n");
a4767edef10d command to log current subtitle to file
henry
parents: 14644
diff changeset
1025 if (subdata->sub_uses_time) {
a4767edef10d command to log current subtitle to file
henry
parents: 14644
diff changeset
1026 fprintf(f, "N: %s S: %02d:%02d:%02d.%02d E: %02d:%02d:%02d.%02d\n", filename,
a4767edef10d command to log current subtitle to file
henry
parents: 14644
diff changeset
1027 vo_sub_last->start/360000, (vo_sub_last->start/6000)%60,
a4767edef10d command to log current subtitle to file
henry
parents: 14644
diff changeset
1028 (vo_sub_last->start/100)%60, vo_sub_last->start%100,
a4767edef10d command to log current subtitle to file
henry
parents: 14644
diff changeset
1029 vo_sub_last->end/360000, (vo_sub_last->end/6000)%60,
a4767edef10d command to log current subtitle to file
henry
parents: 14644
diff changeset
1030 (vo_sub_last->end/100)%60, vo_sub_last->end%100);
a4767edef10d command to log current subtitle to file
henry
parents: 14644
diff changeset
1031 } else {
a4767edef10d command to log current subtitle to file
henry
parents: 14644
diff changeset
1032 fprintf(f, "N: %s S: %d E: %d\n", filename, vo_sub_last->start, vo_sub_last->end);
a4767edef10d command to log current subtitle to file
henry
parents: 14644
diff changeset
1033 }
a4767edef10d command to log current subtitle to file
henry
parents: 14644
diff changeset
1034 for (i = 0; i < vo_sub_last->lines; i++) {
a4767edef10d command to log current subtitle to file
henry
parents: 14644
diff changeset
1035 fprintf(f, "%s\n", vo_sub_last->text[i]);
a4767edef10d command to log current subtitle to file
henry
parents: 14644
diff changeset
1036 }
a4767edef10d command to log current subtitle to file
henry
parents: 14644
diff changeset
1037 fclose(f);
a4767edef10d command to log current subtitle to file
henry
parents: 14644
diff changeset
1038 }
16490
f17b3c152fd6 Add comments to a few #endif statements in order to make clear which
diego
parents: 16489
diff changeset
1039 #endif /* USE_SUB */
14684
a4767edef10d command to log current subtitle to file
henry
parents: 14644
diff changeset
1040
16992
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1041 #define OSD_MSG_TV_CHANNEL 0
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1042 #define OSD_MSG_TEXT 1
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1043 #define OSD_MSG_SUB_DELAY 2
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1044 #define OSD_MSG_SPEED 3
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1045 #define OSD_MSG_OSD_STATUS 4
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1046 #define OSD_MSG_BAR 5
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1047 #define OSD_MSG_PAUSE 6
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1048
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1049 // These will later be implemented via properties and removed
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1050 #define OSD_MSG_AV_DELAY 100
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1051 #define OSD_MSG_FRAMEDROPPING 101
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1052 #define OSD_MSG_ONTOP 102
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1053 #define OSD_MSG_ROOTWIN 103
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1054 #define OSD_MSG_BORDER 104
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1055 #define OSD_MSG_SUB_POS 105
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1056 #define OSD_MSG_SUB_ALIGN 106
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1057 #define OSD_MSG_SUB_VISIBLE 107
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1058 #define OSD_MSG_SUB_CHANGED 108
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1059
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1060 typedef struct mp_osd_msg mp_osd_msg_t;
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1061 struct mp_osd_msg {
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1062 mp_osd_msg_t* prev;
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1063 char msg[64];
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1064 int id,level,started;
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1065 unsigned time; // Display duration in ms
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1066 };
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1067
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1068 static mp_osd_msg_t* osd_msg_stack = NULL;
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1069
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1070 /**
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1071 * \brief Add a message on the OSD message stack
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1072 *
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1073 * If a message with the same id is already present in the stack
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1074 * it is pulled on top of the stack, otherwise a new message is created.
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1075 *
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1076 */
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1077
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1078 static void set_osd_msg(int id, int level, int time, char* fmt, ...) {
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1079 mp_osd_msg_t *msg,*last=NULL;
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1080 va_list va;
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1081
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1082 // look if the id is already in the stack
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1083 for(msg = osd_msg_stack ; msg && msg->id != id ;
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1084 last = msg, msg = msg->prev);
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1085 // not found: alloc it
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1086 if(!msg) {
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1087 msg = calloc(1,sizeof(mp_osd_msg_t));
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1088 msg->prev = osd_msg_stack;
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1089 osd_msg_stack = msg;
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1090 } else if(last) { // found, but it's not on top of the stack
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1091 last->prev = msg->prev;
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1092 msg->prev = osd_msg_stack;
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1093 osd_msg_stack = msg;
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1094 }
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1095 // write the msg
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1096 va_start(va,fmt);
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1097 vsnprintf(msg->msg, 63, fmt, va);
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1098 va_end(va);
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1099 // set id and time
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1100 msg->id = id;
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1101 msg->level = level;
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1102 msg->time = time;
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1103
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1104 }
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1105
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1106 /**
17057
d301c1833d12 Add a function to remove osd msg and use it to remove the "OSD: enabled"
albeu
parents: 17021
diff changeset
1107 * \brief Remove a message from the OSD stack
d301c1833d12 Add a function to remove osd msg and use it to remove the "OSD: enabled"
albeu
parents: 17021
diff changeset
1108 *
d301c1833d12 Add a function to remove osd msg and use it to remove the "OSD: enabled"
albeu
parents: 17021
diff changeset
1109 * This function can be used to get rid of a message right away.
d301c1833d12 Add a function to remove osd msg and use it to remove the "OSD: enabled"
albeu
parents: 17021
diff changeset
1110 *
d301c1833d12 Add a function to remove osd msg and use it to remove the "OSD: enabled"
albeu
parents: 17021
diff changeset
1111 */
d301c1833d12 Add a function to remove osd msg and use it to remove the "OSD: enabled"
albeu
parents: 17021
diff changeset
1112
d301c1833d12 Add a function to remove osd msg and use it to remove the "OSD: enabled"
albeu
parents: 17021
diff changeset
1113 static void rm_osd_msg(int id) {
d301c1833d12 Add a function to remove osd msg and use it to remove the "OSD: enabled"
albeu
parents: 17021
diff changeset
1114 mp_osd_msg_t *msg,*last=NULL;
d301c1833d12 Add a function to remove osd msg and use it to remove the "OSD: enabled"
albeu
parents: 17021
diff changeset
1115
d301c1833d12 Add a function to remove osd msg and use it to remove the "OSD: enabled"
albeu
parents: 17021
diff changeset
1116 // Search for the msg
d301c1833d12 Add a function to remove osd msg and use it to remove the "OSD: enabled"
albeu
parents: 17021
diff changeset
1117 for(msg = osd_msg_stack ; msg && msg->id != id ;
d301c1833d12 Add a function to remove osd msg and use it to remove the "OSD: enabled"
albeu
parents: 17021
diff changeset
1118 last = msg, msg = msg->prev);
d301c1833d12 Add a function to remove osd msg and use it to remove the "OSD: enabled"
albeu
parents: 17021
diff changeset
1119 if(!msg) return;
d301c1833d12 Add a function to remove osd msg and use it to remove the "OSD: enabled"
albeu
parents: 17021
diff changeset
1120
d301c1833d12 Add a function to remove osd msg and use it to remove the "OSD: enabled"
albeu
parents: 17021
diff changeset
1121 // Detach it from the stack and free it
d301c1833d12 Add a function to remove osd msg and use it to remove the "OSD: enabled"
albeu
parents: 17021
diff changeset
1122 if(last)
d301c1833d12 Add a function to remove osd msg and use it to remove the "OSD: enabled"
albeu
parents: 17021
diff changeset
1123 last->prev = msg->prev;
d301c1833d12 Add a function to remove osd msg and use it to remove the "OSD: enabled"
albeu
parents: 17021
diff changeset
1124 else
d301c1833d12 Add a function to remove osd msg and use it to remove the "OSD: enabled"
albeu
parents: 17021
diff changeset
1125 osd_msg_stack = msg->prev;
d301c1833d12 Add a function to remove osd msg and use it to remove the "OSD: enabled"
albeu
parents: 17021
diff changeset
1126 free(msg);
d301c1833d12 Add a function to remove osd msg and use it to remove the "OSD: enabled"
albeu
parents: 17021
diff changeset
1127 }
d301c1833d12 Add a function to remove osd msg and use it to remove the "OSD: enabled"
albeu
parents: 17021
diff changeset
1128
d301c1833d12 Add a function to remove osd msg and use it to remove the "OSD: enabled"
albeu
parents: 17021
diff changeset
1129 /**
16992
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1130 * \brief Get the current message fron the OSD stack
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1131 *
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1132 * This function decrement the message timer and destroy the old ones.
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1133 * The message that should be displayed is returned (if any).
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1134 *
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1135 */
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1136
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1137 static mp_osd_msg_t* get_osd_msg(void) {
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1138 mp_osd_msg_t *msg,*prev,*last = NULL;
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1139 static unsigned last_update = 0;
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1140 unsigned now = GetTimerMS();
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1141 unsigned diff;
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1142 char hidden_dec_done = 0;
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1143
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1144 if(!last_update) last_update = now;
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1145 diff = now >= last_update ? now - last_update : 0;
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1146
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1147 last_update = now;
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1148
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1149 // look for the first message in the stack with high enouth level
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1150 for(msg = osd_msg_stack ; msg ; last = msg, msg = prev) {
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1151 prev = msg->prev;
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1152 if(msg->level > osd_level && hidden_dec_done) continue;
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1153 // The message have an high enouth level or it is the first hidden one
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1154 // in both case we decrement the timer or kill it
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1155 if(!msg->started || msg->time > diff) {
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1156 if(msg->started) msg->time -= diff;
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1157 else msg->started = 1;
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1158 // display it
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1159 if(msg->level <= osd_level) return msg;
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1160 hidden_dec_done = 1;
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1161 continue;
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1162 }
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1163 // kill the message
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1164 free(msg);
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1165 if(last) {
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1166 last->prev = prev;
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1167 msg = last;
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1168 } else {
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1169 osd_msg_stack = prev;
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1170 msg = NULL;
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1171 }
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1172 }
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1173 // Nothing found
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1174 return NULL;
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1175 }
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1176
17021
ded1cc937221 Make the osd command only switch between enabled/disabled when
albeu
parents: 16992
diff changeset
1177 // Make a define to test if we are using the term osd without having
ded1cc937221 Make the osd command only switch between enabled/disabled when
albeu
parents: 16992
diff changeset
1178 // to #ifdef USE_OSD all the time.
ded1cc937221 Make the osd command only switch between enabled/disabled when
albeu
parents: 16992
diff changeset
1179 #ifdef USE_OSD
ded1cc937221 Make the osd command only switch between enabled/disabled when
albeu
parents: 16992
diff changeset
1180 #define use_term_osd (term_osd && !sh_video)
ded1cc937221 Make the osd command only switch between enabled/disabled when
albeu
parents: 16992
diff changeset
1181 #else
ded1cc937221 Make the osd command only switch between enabled/disabled when
albeu
parents: 16992
diff changeset
1182 #define use_term_osd (term_osd)
ded1cc937221 Make the osd command only switch between enabled/disabled when
albeu
parents: 16992
diff changeset
1183 #endif
ded1cc937221 Make the osd command only switch between enabled/disabled when
albeu
parents: 16992
diff changeset
1184
16992
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1185 /**
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1186 * \brief Display the OSD bar.
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1187 *
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1188 * Display the osd bar or fallback on a simple message.
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1189 *
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1190 */
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1191
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1192 void set_osd_bar(int type,char* name,double min,double max,double val) {
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1193
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1194 if(osd_level < 1) return;
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1195
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1196 #ifdef USE_OSD
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1197 if(sh_video) {
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1198 osd_visible = sh_video->fps;
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1199 vo_osd_progbar_type = type;
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1200 vo_osd_progbar_value = 256*(val-min)/(max-min);
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1201 vo_osd_changed(OSDTYPE_PROGBAR);
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1202 return;
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1203 }
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1204 #endif
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1205
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1206 set_osd_msg(OSD_MSG_BAR,1,osd_duration,"%s: %d %%",
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1207 name,ROUND(100*(val-min)/(max-min)));
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1208 }
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1209
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1210
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1211 /**
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1212 * \brief Update the OSD message line.
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1213 *
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1214 * This function display the current message on the vo osd or on the term.
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1215 * If the stack is empty and the osd level is high enouth the timer
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1216 * is displayed (only on the vo osd).
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1217 *
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1218 */
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1219
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1220 static void update_osd_msg(void) {
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1221 mp_osd_msg_t *msg;
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1222 static char osd_text[64] = "";
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1223 static char osd_text_timer[64];
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1224
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1225 #ifdef USE_OSD
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1226 // we need some mem for vo_osd_text
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1227 vo_osd_text = (unsigned char*)osd_text;
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1228 #endif
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1229
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1230 // Look if we have a msg
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1231 if((msg = get_osd_msg())) {
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1232 if(strcmp(osd_text,msg->msg)) {
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1233 strncpy((char*)osd_text, msg->msg, 63);
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1234 #ifdef USE_OSD
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1235 if(sh_video) vo_osd_changed(OSDTYPE_OSD); else
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1236 #endif
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1237 if(term_osd) printf("%s%s\n",term_osd_esc,msg->msg);
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1238 }
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1239 return;
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1240 }
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1241
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1242 #ifdef USE_OSD
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1243 if(sh_video) {
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1244 // fallback on the timer
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1245 if(osd_level>=2) {
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1246 int len = demuxer_get_time_length(demuxer);
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1247 int percentage = -1;
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1248 char percentage_text[10];
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1249 static int last_pts = -303;
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1250 int pts = sh_video->pts;
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1251 if(pts==last_pts-1) ++pts; else last_pts=pts;
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1252
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1253 if (osd_show_percentage)
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1254 percentage = demuxer_get_percent_pos(demuxer);
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1255
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1256 if (percentage >= 0)
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1257 snprintf(percentage_text, 9, " (%d%%)", percentage);
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1258 else
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1259 percentage_text[0] = 0;
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1260
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1261 if (osd_level == 3)
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1262 snprintf(osd_text_timer, 63,
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1263 "%c %02d:%02d:%02d / %02d:%02d:%02d%s",
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1264 osd_function,pts/3600,(pts/60)%60,pts%60,
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1265 len/3600,(len/60)%60,len%60,percentage_text);
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1266 else
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1267 snprintf(osd_text_timer, 63, "%c %02d:%02d:%02d%s",
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1268 osd_function,pts/3600,(pts/60)%60,
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1269 pts%60,percentage_text);
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1270 } else
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1271 osd_text_timer[0]=0;
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1272
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1273 // always decrement the percentage timer
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1274 if(osd_show_percentage)
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1275 osd_show_percentage--;
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1276
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1277 if(strcmp(osd_text,osd_text_timer)) {
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1278 strncpy(osd_text, osd_text_timer, 63);
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1279 vo_osd_changed(OSDTYPE_OSD);
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1280 }
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1281 return;
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1282 }
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1283 #endif
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1284
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1285 // Clear the term osd line
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1286 if(term_osd && osd_text[0]) {
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1287 osd_text[0] = 0;
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1288 printf("%s\n",term_osd_esc);
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1289 }
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1290 }
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1291
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1292
7201
22beff6edf75 Improved MacOS X SDL support, enable SDL main() wrapper for Darwin, remove unused envp.
atmos4
parents: 7191
diff changeset
1293 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
1294
723
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
1295
12890
9a45f43bf9a0 false-use-of-get_path() memleak fixes.
al
parents: 12841
diff changeset
1296 char * mem_ptr;
1289
3f490fad9bdf some code clanup (first step to libdemuxer)
arpi
parents: 1286
diff changeset
1297
3f490fad9bdf some code clanup (first step to libdemuxer)
arpi
parents: 1286
diff changeset
1298 static demux_stream_t *d_audio=NULL;
3f490fad9bdf some code clanup (first step to libdemuxer)
arpi
parents: 1286
diff changeset
1299 static demux_stream_t *d_video=NULL;
3f490fad9bdf some code clanup (first step to libdemuxer)
arpi
parents: 1286
diff changeset
1300 static demux_stream_t *d_dvdsub=NULL;
3f490fad9bdf some code clanup (first step to libdemuxer)
arpi
parents: 1286
diff changeset
1301
1014
e01dc1a88edf fixed punkso's mess... local variables moved back to main()
arpi_esp
parents: 1009
diff changeset
1302 int file_format=DEMUXER_TYPE_UNKNOWN;
4156
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4152
diff changeset
1303
1014
e01dc1a88edf fixed punkso's mess... local variables moved back to main()
arpi_esp
parents: 1009
diff changeset
1304 int delay_corrected=1;
e01dc1a88edf fixed punkso's mess... local variables moved back to main()
arpi_esp
parents: 1009
diff changeset
1305
e01dc1a88edf fixed punkso's mess... local variables moved back to main()
arpi_esp
parents: 1009
diff changeset
1306 // movie info:
e01dc1a88edf fixed punkso's mess... local variables moved back to main()
arpi_esp
parents: 1009
diff changeset
1307
16992
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
1308 // still needed for the subtitles mess
7780
9806d65986e4 Mplayer can switch between subtitles of different languages during
kmkaplan
parents: 7751
diff changeset
1309 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
1310 int osd_show_sub_changed = 0;
1014
e01dc1a88edf fixed punkso's mess... local variables moved back to main()
arpi_esp
parents: 1009
diff changeset
1311
2889
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
1312 int rtc_fd=-1;
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
1313
16345
feb16d0117c8 allow multiple help clauses on the command line, Patch by kiriuja " mplayer-patches AH en-directo POUM net "
gpoirier
parents: 16323
diff changeset
1314 int opt_exit = 0; // flag indicating whether mplayer should exit without playing anything
feb16d0117c8 allow multiple help clauses on the command line, Patch by kiriuja " mplayer-patches AH en-directo POUM net "
gpoirier
parents: 16323
diff changeset
1315
1369
7a2f1881b776 a_frame, v_frame killed, using sh_audio/video->timer. has_audio not more used after initialization.
arpi
parents: 1353
diff changeset
1316 //float a_frame=0; // Audio
1014
e01dc1a88edf fixed punkso's mess... local variables moved back to main()
arpi_esp
parents: 1009
diff changeset
1317
e01dc1a88edf fixed punkso's mess... local variables moved back to main()
arpi_esp
parents: 1009
diff changeset
1318 int i;
9870
09d630a4f991 support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents: 9831
diff changeset
1319 char *tmp;
1014
e01dc1a88edf fixed punkso's mess... local variables moved back to main()
arpi_esp
parents: 1009
diff changeset
1320
1787
de6a0987a08d stop fixed, fileselector supp. maybe not work, couldn't test
arpi
parents: 1772
diff changeset
1321 int gui_no_filename=0;
de6a0987a08d stop fixed, fileselector supp. maybe not work, couldn't test
arpi
parents: 1772
diff changeset
1322
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents: 9593
diff changeset
1323
8932
967a1d1f70c6 The following patch adds a call to srand() with the current time at the
arpi
parents: 8925
diff changeset
1324 srand((int) time(NULL));
967a1d1f70c6 The following patch adds a call to srand() with the current time at the
arpi
parents: 8925
diff changeset
1325
15288
7fc3a521d42b use darwin accurate timer
nplourde
parents: 15285
diff changeset
1326 InitTimer();
7fc3a521d42b use darwin accurate timer
nplourde
parents: 15285
diff changeset
1327
5221
533a58023392 splitted mp_msg_init and mp_msg_set_level
alex
parents: 5217
diff changeset
1328 mp_msg_init();
533a58023392 splitted mp_msg_init and mp_msg_set_level
alex
parents: 5217
diff changeset
1329 mp_msg_set_level(MSGL_STATUS);
1567
5c7760aa4f94 printf->mp_msg/mp_dbg
arpi
parents: 1564
diff changeset
1330
14296
2c1492daa930 happy new year
diego
parents: 14255
diff changeset
1331 mp_msg(MSGT_CPLAYER,MSGL_INFO, "MPlayer " VERSION " (C) 2000-2005 MPlayer Team\n");
2272
c26a9eff0993 cpu detection fixed
arpi
parents: 2265
diff changeset
1332 /* Test for cpu capabilities (and corresponding OS support) for optimizing */
9003
c428933c7e54 AltiVec detection code ("borrowed" from FFmpeg and
arpi
parents: 8996
diff changeset
1333 GetCpuCaps(&gCpuCaps);
14610
9e81b41838e6 Print CPUflags and extension support on x86_64, too
reimar
parents: 14561
diff changeset
1334 #if defined(ARCH_X86) || defined(ARCH_X86_64)
6135
53a0e8f92bbd more cpudetect cosmetics
arpi
parents: 6134
diff changeset
1335 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
1336 gCpuCaps.hasMMX,gCpuCaps.hasMMX2,
2272
c26a9eff0993 cpu detection fixed
arpi
parents: 2265
diff changeset
1337 gCpuCaps.has3DNow, gCpuCaps.has3DNowExt,
c26a9eff0993 cpu detection fixed
arpi
parents: 2265
diff changeset
1338 gCpuCaps.hasSSE, gCpuCaps.hasSSE2);
3742
fb8385e6100d print some info on cpu (runtime/compiled flags)
arpi
parents: 3736
diff changeset
1339 #ifdef RUNTIME_CPUDETECT
6930
cae1dd6343e7 moved messages to help_mp-??.h
jaf
parents: 6921
diff changeset
1340 mp_msg(MSGT_CPLAYER,MSGL_INFO, MSGTR_CompiledWithRuntimeDetection);
3742
fb8385e6100d print some info on cpu (runtime/compiled flags)
arpi
parents: 3736
diff changeset
1341 #else
6930
cae1dd6343e7 moved messages to help_mp-??.h
jaf
parents: 6921
diff changeset
1342 mp_msg(MSGT_CPLAYER,MSGL_INFO, MSGTR_CompiledWithCPUExtensions);
3742
fb8385e6100d print some info on cpu (runtime/compiled flags)
arpi
parents: 3736
diff changeset
1343 #ifdef HAVE_MMX
fb8385e6100d print some info on cpu (runtime/compiled flags)
arpi
parents: 3736
diff changeset
1344 mp_msg(MSGT_CPLAYER,MSGL_INFO," MMX");
fb8385e6100d print some info on cpu (runtime/compiled flags)
arpi
parents: 3736
diff changeset
1345 #endif
fb8385e6100d print some info on cpu (runtime/compiled flags)
arpi
parents: 3736
diff changeset
1346 #ifdef HAVE_MMX2
fb8385e6100d print some info on cpu (runtime/compiled flags)
arpi
parents: 3736
diff changeset
1347 mp_msg(MSGT_CPLAYER,MSGL_INFO," MMX2");
fb8385e6100d print some info on cpu (runtime/compiled flags)
arpi
parents: 3736
diff changeset
1348 #endif
fb8385e6100d print some info on cpu (runtime/compiled flags)
arpi
parents: 3736
diff changeset
1349 #ifdef HAVE_3DNOW
fb8385e6100d print some info on cpu (runtime/compiled flags)
arpi
parents: 3736
diff changeset
1350 mp_msg(MSGT_CPLAYER,MSGL_INFO," 3DNow");
fb8385e6100d print some info on cpu (runtime/compiled flags)
arpi
parents: 3736
diff changeset
1351 #endif
fb8385e6100d print some info on cpu (runtime/compiled flags)
arpi
parents: 3736
diff changeset
1352 #ifdef HAVE_3DNOWEX
fb8385e6100d print some info on cpu (runtime/compiled flags)
arpi
parents: 3736
diff changeset
1353 mp_msg(MSGT_CPLAYER,MSGL_INFO," 3DNowEx");
fb8385e6100d print some info on cpu (runtime/compiled flags)
arpi
parents: 3736
diff changeset
1354 #endif
fb8385e6100d print some info on cpu (runtime/compiled flags)
arpi
parents: 3736
diff changeset
1355 #ifdef HAVE_SSE
fb8385e6100d print some info on cpu (runtime/compiled flags)
arpi
parents: 3736
diff changeset
1356 mp_msg(MSGT_CPLAYER,MSGL_INFO," SSE");
fb8385e6100d print some info on cpu (runtime/compiled flags)
arpi
parents: 3736
diff changeset
1357 #endif
6135
53a0e8f92bbd more cpudetect cosmetics
arpi
parents: 6134
diff changeset
1358 #ifdef HAVE_SSE2
53a0e8f92bbd more cpudetect cosmetics
arpi
parents: 6134
diff changeset
1359 mp_msg(MSGT_CPLAYER,MSGL_INFO," SSE2");
53a0e8f92bbd more cpudetect cosmetics
arpi
parents: 6134
diff changeset
1360 #endif
53a0e8f92bbd more cpudetect cosmetics
arpi
parents: 6134
diff changeset
1361 mp_msg(MSGT_CPLAYER,MSGL_INFO,"\n\n");
16490
f17b3c152fd6 Add comments to a few #endif statements in order to make clear which
diego
parents: 16489
diff changeset
1362 #endif /* RUNTIME_CPUDETECT */
f17b3c152fd6 Add comments to a few #endif statements in order to make clear which
diego
parents: 16489
diff changeset
1363 #endif /* defined(ARCH_X86) || defined(ARCH_X86_64) */
2272
c26a9eff0993 cpu detection fixed
arpi
parents: 2265
diff changeset
1364
10646
012f51c6eaa3 dll loading from codecs dir support for windows
faust3
parents: 10609
diff changeset
1365 #if defined(WIN32) && defined(USE_WIN32DLL)
16781
6809ca5dd307 allow mencoder to load win32 codecs properly patch by Zuxy <zuxy.meng at gmail.com>
faust3
parents: 16758
diff changeset
1366 set_path_env();
10646
012f51c6eaa3 dll loading from codecs dir support for windows
faust3
parents: 10609
diff changeset
1367 #endif /*WIN32 && USE_WIN32DLL*/
012f51c6eaa3 dll loading from codecs dir support for windows
faust3
parents: 10609
diff changeset
1368
7068
6c2d746b17bf 10l, fix compiling without tv. patch by Andreas Hess <jaska@gmx.net>
arpi
parents: 7058
diff changeset
1369 #ifdef USE_TV
5572
8cd761968f35 BSD-BT848 TV update patch by Charles Henrich <henrich@sigbus.com>
arpi
parents: 5520
diff changeset
1370 tv_param_immediate = 1;
7068
6c2d746b17bf 10l, fix compiling without tv. patch by Andreas Hess <jaska@gmx.net>
arpi
parents: 7058
diff changeset
1371 #endif
5572
8cd761968f35 BSD-BT848 TV update patch by Charles Henrich <henrich@sigbus.com>
arpi
parents: 5520
diff changeset
1372
1709
a4e0211455d8 GUI integration, step 1
arpi
parents: 1694
diff changeset
1373 if ( argv[0] )
a4e0211455d8 GUI integration, step 1
arpi
parents: 1694
diff changeset
1374 if(!strcmp(argv[0],"gmplayer") ||
a4e0211455d8 GUI integration, step 1
arpi
parents: 1694
diff changeset
1375 (strrchr(argv[0],'/') && !strcmp(strrchr(argv[0],'/'),"/gmplayer") ) )
a4e0211455d8 GUI integration, step 1
arpi
parents: 1694
diff changeset
1376 use_gui=1;
1639
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
1377
8164
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents: 8123
diff changeset
1378 mconfig = m_config_new();
4156
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4152
diff changeset
1379 m_config_register_options(mconfig,mplayer_opts);
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4152
diff changeset
1380 // TODO : add something to let modules register their options
7867
3dc0b71630ff cleanup config option handling in libmpdemux.
arpi
parents: 7864
diff changeset
1381 mp_input_register_options(mconfig);
4156
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4152
diff changeset
1382 parse_cfgfiles(mconfig);
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4152
diff changeset
1383
7019
e37a67d5e117 fix (?) cmd line handling
pontscho
parents: 7009
diff changeset
1384 #ifdef HAVE_NEW_GUI
e37a67d5e117 fix (?) cmd line handling
pontscho
parents: 7009
diff changeset
1385 if ( use_gui ) cfg_read();
e37a67d5e117 fix (?) cmd line handling
pontscho
parents: 7009
diff changeset
1386 #endif
4156
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4152
diff changeset
1387
8164
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents: 8123
diff changeset
1388 playtree = m_config_parse_mp_command_line(mconfig, argc, argv);
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents: 8123
diff changeset
1389 if(playtree == NULL)
16345
feb16d0117c8 allow multiple help clauses on the command line, Patch by kiriuja " mplayer-patches AH en-directo POUM net "
gpoirier
parents: 16323
diff changeset
1390 opt_exit = 1;
feb16d0117c8 allow multiple help clauses on the command line, Patch by kiriuja " mplayer-patches AH en-directo POUM net "
gpoirier
parents: 16323
diff changeset
1391 else {
4045
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
1392 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
1393 if(playtree) {
4156
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4152
diff changeset
1394 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
1395 if(playtree_iter) {
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
1396 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
1397 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
1398 playtree_iter = NULL;
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
1399 }
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
1400 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
1401 }
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
1402 }
16345
feb16d0117c8 allow multiple help clauses on the command line, Patch by kiriuja " mplayer-patches AH en-directo POUM net "
gpoirier
parents: 16323
diff changeset
1403 }
4045
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
1404
15042
265d8b8adbbe windows priority support patch by Rune Petersen <runner at mail.tele.dk> with the freedom to shoot yourself in the foot
faust3
parents: 14818
diff changeset
1405 #ifdef WIN32
265d8b8adbbe windows priority support patch by Rune Petersen <runner at mail.tele.dk> with the freedom to shoot yourself in the foot
faust3
parents: 14818
diff changeset
1406 if(proc_priority){
265d8b8adbbe windows priority support patch by Rune Petersen <runner at mail.tele.dk> with the freedom to shoot yourself in the foot
faust3
parents: 14818
diff changeset
1407 int i;
265d8b8adbbe windows priority support patch by Rune Petersen <runner at mail.tele.dk> with the freedom to shoot yourself in the foot
faust3
parents: 14818
diff changeset
1408 for(i=0; priority_presets_defs[i].name; i++){
265d8b8adbbe windows priority support patch by Rune Petersen <runner at mail.tele.dk> with the freedom to shoot yourself in the foot
faust3
parents: 14818
diff changeset
1409 if(strcasecmp(priority_presets_defs[i].name, proc_priority) == 0)
265d8b8adbbe windows priority support patch by Rune Petersen <runner at mail.tele.dk> with the freedom to shoot yourself in the foot
faust3
parents: 14818
diff changeset
1410 break;
265d8b8adbbe windows priority support patch by Rune Petersen <runner at mail.tele.dk> with the freedom to shoot yourself in the foot
faust3
parents: 14818
diff changeset
1411 }
265d8b8adbbe windows priority support patch by Rune Petersen <runner at mail.tele.dk> with the freedom to shoot yourself in the foot
faust3
parents: 14818
diff changeset
1412 mp_msg(MSGT_CPLAYER,MSGL_STATUS,"Setting process priority: %s\n",
265d8b8adbbe windows priority support patch by Rune Petersen <runner at mail.tele.dk> with the freedom to shoot yourself in the foot
faust3
parents: 14818
diff changeset
1413 priority_presets_defs[i].name);
265d8b8adbbe windows priority support patch by Rune Petersen <runner at mail.tele.dk> with the freedom to shoot yourself in the foot
faust3
parents: 14818
diff changeset
1414 SetPriorityClass(GetCurrentProcess(), priority_presets_defs[i].prio);
265d8b8adbbe windows priority support patch by Rune Petersen <runner at mail.tele.dk> with the freedom to shoot yourself in the foot
faust3
parents: 14818
diff changeset
1415 }
265d8b8adbbe windows priority support patch by Rune Petersen <runner at mail.tele.dk> with the freedom to shoot yourself in the foot
faust3
parents: 14818
diff changeset
1416 #endif
1709
a4e0211455d8 GUI integration, step 1
arpi
parents: 1694
diff changeset
1417 #ifndef HAVE_NEW_GUI
a4e0211455d8 GUI integration, step 1
arpi
parents: 1694
diff changeset
1418 if(use_gui){
1973
5216f108cb4f all error/warn/info messages moved to help_mp-en.h for translation
arpi
parents: 1962
diff changeset
1419 mp_msg(MSGT_CPLAYER,MSGL_WARN,MSGTR_NoGui);
1709
a4e0211455d8 GUI integration, step 1
arpi
parents: 1694
diff changeset
1420 use_gui=0;
a4e0211455d8 GUI integration, step 1
arpi
parents: 1694
diff changeset
1421 }
1723
5e4214a7540e GUI stuff. now seeking works, and xmga renders to video window
arpi
parents: 1709
diff changeset
1422 #else
5e4214a7540e GUI stuff. now seeking works, and xmga renders to video window
arpi
parents: 1709
diff changeset
1423 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
1424 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
1425 use_gui=0;
5e4214a7540e GUI stuff. now seeking works, and xmga renders to video window
arpi
parents: 1709
diff changeset
1426 }
9291
64b8c5a07c2c - It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents: 9217
diff changeset
1427 if (use_gui && playtree_iter){
9319
arpi
parents: 9318
diff changeset
1428 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
1429 // 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
1430 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
1431 playtree_iter=NULL;
9301
7841308ad250 this patch fixes latest bug, discovered by .so ... (relative filenames &
arpi
parents: 9291
diff changeset
1432
9318
51a9af80d874 PATH_MAX should be more portable, and we even include limits.h to be sure
arpi
parents: 9317
diff changeset
1433 if (getcwd(cwd, PATH_MAX) != (char *)NULL)
9301
7841308ad250 this patch fixes latest bug, discovered by .so ... (relative filenames &
arpi
parents: 9291
diff changeset
1434 {
7841308ad250 this patch fixes latest bug, discovered by .so ... (relative filenames &
arpi
parents: 9291
diff changeset
1435 strcat(cwd, "/");
7841308ad250 this patch fixes latest bug, discovered by .so ... (relative filenames &
arpi
parents: 9291
diff changeset
1436 // Prefix relative paths with current working directory
7841308ad250 this patch fixes latest bug, discovered by .so ... (relative filenames &
arpi
parents: 9291
diff changeset
1437 play_tree_add_bpf(playtree, cwd);
7841308ad250 this patch fixes latest bug, discovered by .so ... (relative filenames &
arpi
parents: 9291
diff changeset
1438 }
9291
64b8c5a07c2c - It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents: 9217
diff changeset
1439 // 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
1440 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
1441 }
16490
f17b3c152fd6 Add comments to a few #endif statements in order to make clear which
diego
parents: 16489
diff changeset
1442 #endif /* HAVE_NEW_GUI */
1709
a4e0211455d8 GUI integration, step 1
arpi
parents: 1694
diff changeset
1443
7562
92188b57a062 video out driver list support (like -vc, example: -vo xmga,xv,x11,)
arpi
parents: 7559
diff changeset
1444 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
1445 list_video_out();
16345
feb16d0117c8 allow multiple help clauses on the command line, Patch by kiriuja " mplayer-patches AH en-directo POUM net "
gpoirier
parents: 16323
diff changeset
1446 opt_exit = 1;
956
a6cecd9a1bad '-ao' switch (including '-ao help'), fixing Arpi's bug (short name 'null' for both of oss and null driver ;)
lgb
parents: 955
diff changeset
1447 }
5072
a760c9f074df libvo2 #ifs removed
arpi
parents: 5055
diff changeset
1448
7563
e9e4398029de audio out driver list support (example: -ao alsa9,sdl:esd,oss,sdl:oss,)
arpi
parents: 7562
diff changeset
1449 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
1450 list_audio_out();
16345
feb16d0117c8 allow multiple help clauses on the command line, Patch by kiriuja " mplayer-patches AH en-directo POUM net "
gpoirier
parents: 16323
diff changeset
1451 opt_exit = 1;
956
a6cecd9a1bad '-ao' switch (including '-ao help'), fixing Arpi's bug (short name 'null' for both of oss and null driver ;)
lgb
parents: 955
diff changeset
1452 }
1639
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
1453
1983
72f0648df475 -ac help / -vc help
arpi
parents: 1973
diff changeset
1454 // check codec.conf
11759
29eea271490e add -codecs-file for selecting a specific codecs.conf on the comand line
attila
parents: 11592
diff changeset
1455 if(!codecs_file || !parse_codec_cfg(codecs_file)){
12890
9a45f43bf9a0 false-use-of-get_path() memleak fixes.
al
parents: 12841
diff changeset
1456 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
1457 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
1458 if(!parse_codec_cfg(NULL)){
29eea271490e add -codecs-file for selecting a specific codecs.conf on the comand line
attila
parents: 11592
diff changeset
1459 mp_msg(MSGT_CPLAYER,MSGL_HINT,MSGTR_CopyCodecsConf);
13500
77b3bc17d764 make sure exit_player gets called
joey
parents: 13391
diff changeset
1460 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
1461 }
13946
e632b43f0598 Reduce excessive verbosity.
diego
parents: 13928
diff changeset
1462 mp_msg(MSGT_CPLAYER,MSGL_V,MSGTR_BuiltinCodecsConf);
8467
3ca9cc46df5c Fallback to builtin (generated from etc/codecs.conf at compile time)
arpi
parents: 8450
diff changeset
1463 }
1983
72f0648df475 -ac help / -vc help
arpi
parents: 1973
diff changeset
1464 }
12890
9a45f43bf9a0 false-use-of-get_path() memleak fixes.
al
parents: 12841
diff changeset
1465 free( mem_ptr ); // release the buffer created by get_path()
1983
72f0648df475 -ac help / -vc help
arpi
parents: 1973
diff changeset
1466 }
72f0648df475 -ac help / -vc help
arpi
parents: 1973
diff changeset
1467
7506
c1cb94198e05 -vc/-vfm accepts codec/driver _list_ now. empty list element for -vc means
arpi
parents: 7502
diff changeset
1468 #if 0
c1cb94198e05 -vc/-vfm accepts codec/driver _list_ now. empty list element for -vc means
arpi
parents: 7502
diff changeset
1469 if(video_codec_list){
c1cb94198e05 -vc/-vfm accepts codec/driver _list_ now. empty list element for -vc means
arpi
parents: 7502
diff changeset
1470 int i;
c1cb94198e05 -vc/-vfm accepts codec/driver _list_ now. empty list element for -vc means
arpi
parents: 7502
diff changeset
1471 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
1472 for(i=0;video_codec_list[i];i++)
13577
606d90e03a2f printf --> mp_msg conversion
diego
parents: 13502
diff changeset
1473 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
1474 }
c1cb94198e05 -vc/-vfm accepts codec/driver _list_ now. empty list element for -vc means
arpi
parents: 7502
diff changeset
1475 #endif
7522
aa1a1249f239 -ac/-afm rewrite, now works the same way as -vc/-vfm
arpi
parents: 7517
diff changeset
1476 if(audio_codec_list && strcmp(audio_codec_list[0],"help")==0){
6930
cae1dd6343e7 moved messages to help_mp-??.h
jaf
parents: 6921
diff changeset
1477 mp_msg(MSGT_CPLAYER, MSGL_INFO, MSGTR_AvailableAudioCodecs);
15789
32d9c8a0a02b adds some more -identify output, patch by kiriuja < mplayer DASH patches PAM en DASH directo POUM net>
gpoirier
parents: 15706
diff changeset
1478 if (identify)
32d9c8a0a02b adds some more -identify output, patch by kiriuja < mplayer DASH patches PAM en DASH directo POUM net>
gpoirier
parents: 15706
diff changeset
1479 mp_msg(MSGT_GLOBAL, MSGL_INFO, "ID_AUDIO_CODECS\n");
1983
72f0648df475 -ac help / -vc help
arpi
parents: 1973
diff changeset
1480 list_codecs(1);
13577
606d90e03a2f printf --> mp_msg conversion
diego
parents: 13502
diff changeset
1481 mp_msg(MSGT_FIXME, MSGL_FIXME, "\n");
16345
feb16d0117c8 allow multiple help clauses on the command line, Patch by kiriuja " mplayer-patches AH en-directo POUM net "
gpoirier
parents: 16323
diff changeset
1482 opt_exit = 1;
1983
72f0648df475 -ac help / -vc help
arpi
parents: 1973
diff changeset
1483 }
7506
c1cb94198e05 -vc/-vfm accepts codec/driver _list_ now. empty list element for -vc means
arpi
parents: 7502
diff changeset
1484 if(video_codec_list && strcmp(video_codec_list[0],"help")==0){
6930
cae1dd6343e7 moved messages to help_mp-??.h
jaf
parents: 6921
diff changeset
1485 mp_msg(MSGT_CPLAYER, MSGL_INFO, MSGTR_AvailableVideoCodecs);
15789
32d9c8a0a02b adds some more -identify output, patch by kiriuja < mplayer DASH patches PAM en DASH directo POUM net>
gpoirier
parents: 15706
diff changeset
1486 if (identify)
32d9c8a0a02b adds some more -identify output, patch by kiriuja < mplayer DASH patches PAM en DASH directo POUM net>
gpoirier
parents: 15706
diff changeset
1487 mp_msg(MSGT_GLOBAL, MSGL_INFO, "ID_VIDEO_CODECS\n");
1983
72f0648df475 -ac help / -vc help
arpi
parents: 1973
diff changeset
1488 list_codecs(0);
13577
606d90e03a2f printf --> mp_msg conversion
diego
parents: 13502
diff changeset
1489 mp_msg(MSGT_FIXME, MSGL_FIXME, "\n");
16345
feb16d0117c8 allow multiple help clauses on the command line, Patch by kiriuja " mplayer-patches AH en-directo POUM net "
gpoirier
parents: 16323
diff changeset
1490 opt_exit = 1;
1983
72f0648df475 -ac help / -vc help
arpi
parents: 1973
diff changeset
1491 }
7506
c1cb94198e05 -vc/-vfm accepts codec/driver _list_ now. empty list element for -vc means
arpi
parents: 7502
diff changeset
1492 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
1493 vfm_help();
13577
606d90e03a2f printf --> mp_msg conversion
diego
parents: 13502
diff changeset
1494 mp_msg(MSGT_FIXME, MSGL_FIXME, "\n");
16345
feb16d0117c8 allow multiple help clauses on the command line, Patch by kiriuja " mplayer-patches AH en-directo POUM net "
gpoirier
parents: 16323
diff changeset
1495 opt_exit = 1;
7191
1eadce15446c -afm/-vfm help implemenetd, some cosmetics of ad/vd codec names/comments
arpi
parents: 7180
diff changeset
1496 }
7522
aa1a1249f239 -ac/-afm rewrite, now works the same way as -vc/-vfm
arpi
parents: 7517
diff changeset
1497 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
1498 afm_help();
13577
606d90e03a2f printf --> mp_msg conversion
diego
parents: 13502
diff changeset
1499 mp_msg(MSGT_FIXME, MSGL_FIXME, "\n");
16345
feb16d0117c8 allow multiple help clauses on the command line, Patch by kiriuja " mplayer-patches AH en-directo POUM net "
gpoirier
parents: 16323
diff changeset
1500 opt_exit = 1;
7191
1eadce15446c -afm/-vfm help implemenetd, some cosmetics of ad/vd codec names/comments
arpi
parents: 7180
diff changeset
1501 }
13269
aa13937da8a0 mplayer -af help now lists all available audio filters.
ivo
parents: 13228
diff changeset
1502 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
1503 af_help();
aa13937da8a0 mplayer -af help now lists all available audio filters.
ivo
parents: 13228
diff changeset
1504 printf("\n");
16345
feb16d0117c8 allow multiple help clauses on the command line, Patch by kiriuja " mplayer-patches AH en-directo POUM net "
gpoirier
parents: 16323
diff changeset
1505 opt_exit = 1;
13269
aa13937da8a0 mplayer -af help now lists all available audio filters.
ivo
parents: 13228
diff changeset
1506 }
9336
4d39aa85a723 Forgot about #ifdef HAVE_X11. 10l
filon
parents: 9319
diff changeset
1507 #ifdef HAVE_X11
9317
c7f5df43b937 - support command line parameter -fstype, eg. -fstype layer=12,above,fullscreen
filon
parents: 9315
diff changeset
1508 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
1509 fstype_help();
13577
606d90e03a2f printf --> mp_msg conversion
diego
parents: 13502
diff changeset
1510 mp_msg(MSGT_FIXME, MSGL_FIXME, "\n");
16345
feb16d0117c8 allow multiple help clauses on the command line, Patch by kiriuja " mplayer-patches AH en-directo POUM net "
gpoirier
parents: 16323
diff changeset
1511 opt_exit = 1;
9317
c7f5df43b937 - support command line parameter -fstype, eg. -fstype layer=12,above,fullscreen
filon
parents: 9315
diff changeset
1512 }
9336
4d39aa85a723 Forgot about #ifdef HAVE_X11. 10l
filon
parents: 9319
diff changeset
1513 #endif
16175
6b86089c2edd Demuxer modularization
rtognimp
parents: 16152
diff changeset
1514 if((demuxer_name && strcmp(demuxer_name,"help")==0) ||
6b86089c2edd Demuxer modularization
rtognimp
parents: 16152
diff changeset
1515 (audio_demuxer_name && strcmp(audio_demuxer_name,"help")==0) ||
6b86089c2edd Demuxer modularization
rtognimp
parents: 16152
diff changeset
1516 (sub_demuxer_name && strcmp(sub_demuxer_name,"help")==0)){
6b86089c2edd Demuxer modularization
rtognimp
parents: 16152
diff changeset
1517 demuxer_help();
6b86089c2edd Demuxer modularization
rtognimp
parents: 16152
diff changeset
1518 mp_msg(MSGT_CPLAYER, MSGL_INFO, "\n");
16345
feb16d0117c8 allow multiple help clauses on the command line, Patch by kiriuja " mplayer-patches AH en-directo POUM net "
gpoirier
parents: 16323
diff changeset
1519 opt_exit = 1;
16175
6b86089c2edd Demuxer modularization
rtognimp
parents: 16152
diff changeset
1520 }
1983
72f0648df475 -ac help / -vc help
arpi
parents: 1973
diff changeset
1521
16345
feb16d0117c8 allow multiple help clauses on the command line, Patch by kiriuja " mplayer-patches AH en-directo POUM net "
gpoirier
parents: 16323
diff changeset
1522 if(opt_exit)
feb16d0117c8 allow multiple help clauses on the command line, Patch by kiriuja " mplayer-patches AH en-directo POUM net "
gpoirier
parents: 16323
diff changeset
1523 exit_player(NULL);
feb16d0117c8 allow multiple help clauses on the command line, Patch by kiriuja " mplayer-patches AH en-directo POUM net "
gpoirier
parents: 16323
diff changeset
1524
8531
1aa2c9b460af Merged EDL 0.5 patch - it's something like Quicktime's edit lists.
arpi
parents: 8494
diff changeset
1525 #ifdef USE_EDL
13168
ce046ef860da EDL enhancement/fixes:
rtognimp
parents: 13132
diff changeset
1526 if (edl_check_mode() == EDL_ERROR && edl_filename)
ce046ef860da EDL enhancement/fixes:
rtognimp
parents: 13132
diff changeset
1527 {
13358
567875b88aab Hardcoded EDL messages moved to help_mp-en.h, Doxygen comments added, patch
diego
parents: 13353
diff changeset
1528 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
1529 exit_player(NULL);
13168
ce046ef860da EDL enhancement/fixes:
rtognimp
parents: 13132
diff changeset
1530 } else if (edl_filename)
ce046ef860da EDL enhancement/fixes:
rtognimp
parents: 13132
diff changeset
1531 {
14807
664b06b907cb Some to-be-redundant EDL code moved to edl.c with mencoder's edl in mind. Stack handling improvements, Patch by Oded Shimon
reynaldo
parents: 14718
diff changeset
1532 if (edl_records) free_edl(edl_records);
664b06b907cb Some to-be-redundant EDL code moved to edl.c with mencoder's edl in mind. Stack handling improvements, Patch by Oded Shimon
reynaldo
parents: 14718
diff changeset
1533 next_edl_record = edl_records = edl_parse_file();
13168
ce046ef860da EDL enhancement/fixes:
rtognimp
parents: 13132
diff changeset
1534 } else if (edl_output_filename)
ce046ef860da EDL enhancement/fixes:
rtognimp
parents: 13132
diff changeset
1535 {
ce046ef860da EDL enhancement/fixes:
rtognimp
parents: 13132
diff changeset
1536 if ((edl_fd = fopen(edl_output_filename, "w")) == NULL)
ce046ef860da EDL enhancement/fixes:
rtognimp
parents: 13132
diff changeset
1537 {
13358
567875b88aab Hardcoded EDL messages moved to help_mp-en.h, Doxygen comments added, patch
diego
parents: 13353
diff changeset
1538 mp_msg(MSGT_CPLAYER, MSGL_ERR, MSGTR_EdlCantOpenForWrite,
13168
ce046ef860da EDL enhancement/fixes:
rtognimp
parents: 13132
diff changeset
1539 edl_output_filename);
13358
567875b88aab Hardcoded EDL messages moved to help_mp-en.h, Doxygen comments added, patch
diego
parents: 13353
diff changeset
1540 exit_player(NULL);
13168
ce046ef860da EDL enhancement/fixes:
rtognimp
parents: 13132
diff changeset
1541 }
ce046ef860da EDL enhancement/fixes:
rtognimp
parents: 13132
diff changeset
1542 }
8531
1aa2c9b460af Merged EDL 0.5 patch - it's something like Quicktime's edit lists.
arpi
parents: 8494
diff changeset
1543 #endif
1983
72f0648df475 -ac help / -vc help
arpi
parents: 1973
diff changeset
1544
16347
da2926d990ce Adds -idle, an option to make MPlayer wait for input ('loadfile' or
ods15
parents: 16346
diff changeset
1545 if (player_idle_mode && use_gui) {
da2926d990ce Adds -idle, an option to make MPlayer wait for input ('loadfile' or
ods15
parents: 16346
diff changeset
1546 mp_msg(MSGT_CPLAYER, MSGL_FATAL, MSGTR_NoIdleAndGui);
da2926d990ce Adds -idle, an option to make MPlayer wait for input ('loadfile' or
ods15
parents: 16346
diff changeset
1547 exit_player_with_rc(NULL, 1);
da2926d990ce Adds -idle, an option to make MPlayer wait for input ('loadfile' or
ods15
parents: 16346
diff changeset
1548 }
da2926d990ce Adds -idle, an option to make MPlayer wait for input ('loadfile' or
ods15
parents: 16346
diff changeset
1549
da2926d990ce Adds -idle, an option to make MPlayer wait for input ('loadfile' or
ods15
parents: 16346
diff changeset
1550 if(!filename && !player_idle_mode){
1787
de6a0987a08d stop fixed, fileselector supp. maybe not work, couldn't test
arpi
parents: 1772
diff changeset
1551 if(!use_gui){
1690
09f9297d2ee6 -vo help fixed
arpi
parents: 1674
diff changeset
1552 // no file/vcd/dvd -> show HELP:
5112
70fb281bb13c changed printf's to mp_msg
alex
parents: 5106
diff changeset
1553 mp_msg(MSGT_CPLAYER, MSGL_INFO, help_text);
13500
77b3bc17d764 make sure exit_player gets called
joey
parents: 13391
diff changeset
1554 exit_player_with_rc(NULL, 0);
1787
de6a0987a08d stop fixed, fileselector supp. maybe not work, couldn't test
arpi
parents: 1772
diff changeset
1555 } else gui_no_filename=1;
1690
09f9297d2ee6 -vo help fixed
arpi
parents: 1674
diff changeset
1556 }
09f9297d2ee6 -vo help fixed
arpi
parents: 1674
diff changeset
1557
09f9297d2ee6 -vo help fixed
arpi
parents: 1674
diff changeset
1558 // Many users forget to include command line in bugreports...
8027
b9da278e4c92 verbose can be negative
arpi
parents: 8023
diff changeset
1559 if(verbose>0){
13577
606d90e03a2f printf --> mp_msg conversion
diego
parents: 13502
diff changeset
1560 mp_msg(MSGT_CPLAYER, MSGL_INFO, MSGTR_CommandLine);
14530
ea8a371b7d8d print the actual commandline to stdout, too
faust3
parents: 14381
diff changeset
1561 for(i=1;i<argc;i++)mp_msg(MSGT_CPLAYER, MSGL_INFO," '%s'",argv[i]);
ea8a371b7d8d print the actual commandline to stdout, too
faust3
parents: 14381
diff changeset
1562 mp_msg(MSGT_CPLAYER, MSGL_INFO, "\n");
1690
09f9297d2ee6 -vo help fixed
arpi
parents: 1674
diff changeset
1563 }
09f9297d2ee6 -vo help fixed
arpi
parents: 1674
diff changeset
1564
5221
533a58023392 splitted mp_msg_init and mp_msg_set_level
alex
parents: 5217
diff changeset
1565 mp_msg_set_level(verbose+MSGL_STATUS);
1183
6fbcfe7f7f10 vo/ao_subdevice implemented
al3x
parents: 1177
diff changeset
1566
1639
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
1567 //------ load global data first ------
955
3a3304cd9fd5 libao support
arpi_esp
parents: 940
diff changeset
1568
11580
90953d955165 Fontconfig support based on patch by Arwed von Merkatz <v.merkatz@gmx.net>, but slightly reworked
alex
parents: 11542
diff changeset
1569 // check font
7122
0dc9cb756b68 freetype 2.0/2.1+ support - disabled by default until bugs fixed
arpi
parents: 7111
diff changeset
1570 #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
1571 #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
1572 init_freetype();
90953d955165 Fontconfig support based on patch by Arwed von Merkatz <v.merkatz@gmx.net>, but slightly reworked
alex
parents: 11542
diff changeset
1573 #endif
90953d955165 Fontconfig support based on patch by Arwed von Merkatz <v.merkatz@gmx.net>, but slightly reworked
alex
parents: 11542
diff changeset
1574 #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
1575 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
1576 {
90953d955165 Fontconfig support based on patch by Arwed von Merkatz <v.merkatz@gmx.net>, but slightly reworked
alex
parents: 11542
diff changeset
1577 #endif
212
7034ef1f685d new option: -font
arpi_esp
parents: 208
diff changeset
1578 if(font_name){
337
3ca0b1b739a5 changed fs+vm+zoom flags for libvo
arpi_esp
parents: 332
diff changeset
1579 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
1580 if(!vo_font) mp_msg(MSGT_CPLAYER,MSGL_ERR,MSGTR_CantLoadFont,font_name);
220
5348fa1313fe OSD functionality improved
arpi_esp
parents: 215
diff changeset
1581 } else {
5348fa1313fe OSD functionality improved
arpi_esp
parents: 215
diff changeset
1582 // try default:
12890
9a45f43bf9a0 false-use-of-get_path() memleak fixes.
al
parents: 12841
diff changeset
1583 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
1584 free(mem_ptr); // release the buffer created by get_path()
1353
c3e3b0ae4d06 Applied DATADIR patch by Vladimir Kushnir
arpi
parents: 1338
diff changeset
1585 if(!vo_font)
10272
7b0bc557987b renames: DATADIR->MPLAYER_DATADIR, CONFDIR->MPLAYER_CONFDIR, LIBDIR->MPLAYER_LIBDIR
arpi
parents: 10240
diff changeset
1586 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
1587 }
11580
90953d955165 Fontconfig support based on patch by Arwed von Merkatz <v.merkatz@gmx.net>, but slightly reworked
alex
parents: 11542
diff changeset
1588 #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
1589 }
1422
d02e0dcaf077 libvo2 support
arpi
parents: 1421
diff changeset
1590 #endif
16490
f17b3c152fd6 Add comments to a few #endif statements in order to make clear which
diego
parents: 16489
diff changeset
1591 #endif /* USE_OSD */
5638
86663f1b9b00 new osd code, use osd objs to follow changes and do minimal updates
arpi
parents: 5627
diff changeset
1592 vo_init_osd();
86663f1b9b00 new osd code, use osd objs to follow changes and do minimal updates
arpi
parents: 5627
diff changeset
1593
3015
8bf21c807656 RTC is autodetected
arpi
parents: 2941
diff changeset
1594 #ifdef HAVE_RTC
5055
534167719e91 nortc patch by Attila Kinali
atmos4
parents: 5046
diff changeset
1595 if(!nortc)
534167719e91 nortc patch by Attila Kinali
atmos4
parents: 5046
diff changeset
1596 {
7494
229287c14cd4 RTC fixes by Sidik Isani <lksi@cfht.hawaii.edu>
arpi
parents: 7486
diff changeset
1597 // 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
1598 if ((rtc_fd = open(rtc_device ? rtc_device : "/dev/rtc", O_RDONLY)) < 0)
13577
606d90e03a2f printf --> mp_msg conversion
diego
parents: 13502
diff changeset
1599 mp_msg(MSGT_CPLAYER, MSGL_WARN, MSGTR_RTCDeviceNotOpenable,
12681
6d815f12e3e5 rtc-device cmd option by James Noble
alex
parents: 12672
diff changeset
1600 rtc_device ? rtc_device : "/dev/rtc", strerror(errno));
7494
229287c14cd4 RTC fixes by Sidik Isani <lksi@cfht.hawaii.edu>
arpi
parents: 7486
diff changeset
1601 else {
229287c14cd4 RTC fixes by Sidik Isani <lksi@cfht.hawaii.edu>
arpi
parents: 7486
diff changeset
1602 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
1603
229287c14cd4 RTC fixes by Sidik Isani <lksi@cfht.hawaii.edu>
arpi
parents: 7486
diff changeset
1604 if (ioctl(rtc_fd, RTC_IRQP_SET, irqp) < 0) {
13577
606d90e03a2f printf --> mp_msg conversion
diego
parents: 13502
diff changeset
1605 mp_msg(MSGT_CPLAYER, MSGL_WARN, MSGTR_LinuxRTCInitErrorIrqpSet, irqp, strerror(errno));
606d90e03a2f printf --> mp_msg conversion
diego
parents: 13502
diff changeset
1606 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
1607 close (rtc_fd);
2889
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
1608 rtc_fd = -1;
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
1609 } 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
1610 /* variable only by the root */
13577
606d90e03a2f printf --> mp_msg conversion
diego
parents: 13502
diff changeset
1611 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
1612 close (rtc_fd);
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
1613 rtc_fd = -1;
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
1614 } else
13946
e632b43f0598 Reduce excessive verbosity.
diego
parents: 13928
diff changeset
1615 mp_msg(MSGT_CPLAYER, MSGL_V, MSGTR_UsingRTCTiming, irqp);
2889
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
1616 }
5055
534167719e91 nortc patch by Attila Kinali
atmos4
parents: 5046
diff changeset
1617 }
4176
116abdd0aed1 small gtk bug fix (-display bug, baze gabu, miattad fogok elkarhozni:), and remove gui dependencie in mencoder
pontscho
parents: 4160
diff changeset
1618 #ifdef HAVE_NEW_GUI
3825
7735c5a87121 setuid hack disabled
arpi
parents: 3823
diff changeset
1619 // 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
1620 // 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
1621 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
1622 #endif
2889
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
1623 if(rtc_fd<0)
16490
f17b3c152fd6 Add comments to a few #endif statements in order to make clear which
diego
parents: 16489
diff changeset
1624 #endif /* HAVE_RTC */
13946
e632b43f0598 Reduce excessive verbosity.
diego
parents: 13928
diff changeset
1625 mp_msg(MSGT_CPLAYER, MSGL_V, "Using %s timing\n",
12954
f9755d9c479a Native darwin timer update.
wight
parents: 12893
diff changeset
1626 softsleep?"software":timer_name);
2889
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
1627
1639
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
1628 #ifdef USE_TERMCAP
3618
772729dd7b40 better dvd support
pontscho
parents: 3597
diff changeset
1629 if ( !use_gui ) load_termcap(NULL); // load key-codes
1639
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
1630 #endif
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
1631
1816
c8bc613eb4f8 fixed 'n' key bug :)
arpi
parents: 1809
diff changeset
1632 // ========== Init keyboard FIFO (connection to libvo) ============
1694
0def229bd8bc GUI support (--enable-gui)
arpi
parents: 1690
diff changeset
1633
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
1634 // Init input system
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
1635 current_module = "init_input";
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
1636 mp_input_init();
14077
3d3f3cc8494a use a configurable-size ringbuffer instead of a pipe for buffering key events.
reimar
parents: 14053
diff changeset
1637 #if 0
9831
0397b461f0fb MINGW32 port and select()less fifocode by Arpi
faust3
parents: 9752
diff changeset
1638 make_pipe(&keyb_fifo_get,&keyb_fifo_put);
0397b461f0fb MINGW32 port and select()less fifocode by Arpi
faust3
parents: 9752
diff changeset
1639
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
1640 if(keyb_fifo_get > 0)
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
1641 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
1642 #else
0397b461f0fb MINGW32 port and select()less fifocode by Arpi
faust3
parents: 9752
diff changeset
1643 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
1644 #endif
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
1645 if(slave_mode)
10928
f2313bd91594 add a read function for slave mode on mingw
faust3
parents: 10917
diff changeset
1646 #ifndef __MINGW32__
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
1647 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
1648 #else
f2313bd91594 add a read function for slave mode on mingw
faust3
parents: 10917
diff changeset
1649 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
1650 #endif
12816
fba780800efe -use-stdin renamed to -noconsolecontrols.
diego
parents: 12753
diff changeset
1651 else if(!noconsolecontrols)
9831
0397b461f0fb MINGW32 port and select()less fifocode by Arpi
faust3
parents: 9752
diff changeset
1652 #ifndef HAVE_NO_POSIX_SELECT
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
1653 mp_input_add_key_fd(0,1,NULL,NULL);
9831
0397b461f0fb MINGW32 port and select()less fifocode by Arpi
faust3
parents: 9752
diff changeset
1654 #else
0397b461f0fb MINGW32 port and select()less fifocode by Arpi
faust3
parents: 9752
diff changeset
1655 mp_input_add_key_fd(0,0,NULL,NULL);
0397b461f0fb MINGW32 port and select()less fifocode by Arpi
faust3
parents: 9752
diff changeset
1656 #endif
0397b461f0fb MINGW32 port and select()less fifocode by Arpi
faust3
parents: 9752
diff changeset
1657
4431
44c23fd75005 Added uninit to input
albeu
parents: 4418
diff changeset
1658 inited_flags|=INITED_INPUT;
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
1659 current_module = NULL;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
1660
8198
1935017c0f71 Experimantal OSD menu
albeu
parents: 8164
diff changeset
1661 #ifdef HAVE_MENU
1935017c0f71 Experimantal OSD menu
albeu
parents: 8164
diff changeset
1662 if(use_menu) {
8723
48a2c2545d5c Use system-wide menu.conf file if nothing else is availible,
filon
parents: 8672
diff changeset
1663 if(menu_cfg && menu_init(menu_cfg))
13577
606d90e03a2f printf --> mp_msg conversion
diego
parents: 13502
diff changeset
1664 mp_msg(MSGT_CPLAYER,MSGL_INFO,MSGTR_MenuInitialized, menu_cfg);
8198
1935017c0f71 Experimantal OSD menu
albeu
parents: 8164
diff changeset
1665 else {
8723
48a2c2545d5c Use system-wide menu.conf file if nothing else is availible,
filon
parents: 8672
diff changeset
1666 menu_cfg = get_path("menu.conf");
48a2c2545d5c Use system-wide menu.conf file if nothing else is availible,
filon
parents: 8672
diff changeset
1667 if(menu_init(menu_cfg))
13577
606d90e03a2f printf --> mp_msg conversion
diego
parents: 13502
diff changeset
1668 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
1669 else {
10272
7b0bc557987b renames: DATADIR->MPLAYER_DATADIR, CONFDIR->MPLAYER_CONFDIR, LIBDIR->MPLAYER_LIBDIR
arpi
parents: 10240
diff changeset
1670 if(menu_init(MPLAYER_CONFDIR "/menu.conf"))
13577
606d90e03a2f printf --> mp_msg conversion
diego
parents: 13502
diff changeset
1671 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
1672 else {
13577
606d90e03a2f printf --> mp_msg conversion
diego
parents: 13502
diff changeset
1673 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
1674 use_menu = 0;
48a2c2545d5c Use system-wide menu.conf file if nothing else is availible,
filon
parents: 8672
diff changeset
1675 }
48a2c2545d5c Use system-wide menu.conf file if nothing else is availible,
filon
parents: 8672
diff changeset
1676 }
8198
1935017c0f71 Experimantal OSD menu
albeu
parents: 8164
diff changeset
1677 }
1935017c0f71 Experimantal OSD menu
albeu
parents: 8164
diff changeset
1678 }
1935017c0f71 Experimantal OSD menu
albeu
parents: 8164
diff changeset
1679 #endif
1935017c0f71 Experimantal OSD menu
albeu
parents: 8164
diff changeset
1680
13391
b6c3752d9544 handle sigchld in mplayer.c
faust3
parents: 13358
diff changeset
1681 /// Catch signals
b6c3752d9544 handle sigchld in mplayer.c
faust3
parents: 13358
diff changeset
1682 #ifndef __MINGW32__
b6c3752d9544 handle sigchld in mplayer.c
faust3
parents: 13358
diff changeset
1683 signal(SIGCHLD,child_sighandler);
b6c3752d9544 handle sigchld in mplayer.c
faust3
parents: 13358
diff changeset
1684 #endif
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
1685
13794
fb83e23e94ce Allow attaching gdb on crash automatically.
reimar
parents: 13773
diff changeset
1686 #ifdef CRASH_DEBUG
fb83e23e94ce Allow attaching gdb on crash automatically.
reimar
parents: 13773
diff changeset
1687 prog_path = argv[0];
fb83e23e94ce Allow attaching gdb on crash automatically.
reimar
parents: 13773
diff changeset
1688 #endif
1639
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
1689 //========= Catch terminate signals: ================
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
1690 // terminate requests:
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
1691 signal(SIGTERM,exit_sighandler); // kill
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
1692 signal(SIGHUP,exit_sighandler); // kill -HUP / xterm closed
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
1693
1729
d6c99f70449e fix hprogressbar
pontscho
parents: 1727
diff changeset
1694 signal(SIGINT,exit_sighandler); // Interrupt from keyboard
1639
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
1695
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
1696 signal(SIGQUIT,exit_sighandler); // Quit from keyboard
16049
0ccf19820216 define SIGHUP and SIGPIPE for MinGW and catch SIGPIPE also in mplayer
reimar
parents: 16036
diff changeset
1697 signal(SIGPIPE,exit_sighandler); // Some window managers cause this
5367
658ea5d7316a Allow to disable crasj sighandler to enable creation of coredump files.
atmos4
parents: 5326
diff changeset
1698 #ifdef ENABLE_SIGHANDLER
1639
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
1699 // fatal errors:
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
1700 signal(SIGBUS,exit_sighandler); // bus error
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
1701 signal(SIGSEGV,exit_sighandler); // segfault
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
1702 signal(SIGILL,exit_sighandler); // illegal instruction
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
1703 signal(SIGFPE,exit_sighandler); // floating point exc.
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
1704 signal(SIGABRT,exit_sighandler); // abort()
13794
fb83e23e94ce Allow attaching gdb on crash automatically.
reimar
parents: 13773
diff changeset
1705 #ifdef CRASH_DEBUG
fb83e23e94ce Allow attaching gdb on crash automatically.
reimar
parents: 13773
diff changeset
1706 if (crash_debug)
fb83e23e94ce Allow attaching gdb on crash automatically.
reimar
parents: 13773
diff changeset
1707 signal(SIGTRAP,exit_sighandler);
fb83e23e94ce Allow attaching gdb on crash automatically.
reimar
parents: 13773
diff changeset
1708 #endif
5367
658ea5d7316a Allow to disable crasj sighandler to enable creation of coredump files.
atmos4
parents: 5326
diff changeset
1709 #endif
1639
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
1710
4963
13262bd21965 small changes
pontscho
parents: 4950
diff changeset
1711 #ifdef HAVE_NEW_GUI
13262bd21965 small changes
pontscho
parents: 4950
diff changeset
1712 if(use_gui){
6218
8cfddba867b4 fix text render chrash ...
pontscho
parents: 6217
diff changeset
1713 guiInit();
4963
13262bd21965 small changes
pontscho
parents: 4950
diff changeset
1714 inited_flags|=INITED_GUI;
4974
5da7b1522a9f small bug fixed and workarounds :(
pontscho
parents: 4965
diff changeset
1715 guiGetEvent( guiCEvent,(char *)((gui_no_filename) ? 0 : 1) );
4963
13262bd21965 small changes
pontscho
parents: 4950
diff changeset
1716 }
13262bd21965 small changes
pontscho
parents: 4950
diff changeset
1717 #endif
13262bd21965 small changes
pontscho
parents: 4950
diff changeset
1718
5983
4d868c3c9fff some cleanup around uninit()
arpi
parents: 5955
diff changeset
1719 // ******************* Now, let's see the per-file stuff ********************
4d868c3c9fff some cleanup around uninit()
arpi
parents: 5955
diff changeset
1720
1639
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
1721 play_next_file:
1787
de6a0987a08d stop fixed, fileselector supp. maybe not work, couldn't test
arpi
parents: 1772
diff changeset
1722
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
1723 // 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
1724 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
1725 { 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
1726 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
1727
8614
49e36bf2f342 The patch adds support for a per-file config, which is loaded before
arpi
parents: 8612
diff changeset
1728 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
1729
4835
1f59d4d73558 Fix my mistake (forgot to remove a getch2_enable) but in the rigth
albeu
parents: 4834
diff changeset
1730 // 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
1731 // or cache filling
12816
fba780800efe -use-stdin renamed to -noconsolecontrols.
diego
parents: 12753
diff changeset
1732 if(!noconsolecontrols && !slave_mode){
5983
4d868c3c9fff some cleanup around uninit()
arpi
parents: 5955
diff changeset
1733 if(inited_flags&INITED_GETCH2)
13577
606d90e03a2f printf --> mp_msg conversion
diego
parents: 13502
diff changeset
1734 mp_msg(MSGT_CPLAYER,MSGL_WARN,MSGTR_Getch2InitializedTwice);
5983
4d868c3c9fff some cleanup around uninit()
arpi
parents: 5955
diff changeset
1735 else
4d868c3c9fff some cleanup around uninit()
arpi
parents: 5955
diff changeset
1736 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
1737 inited_flags|=INITED_GETCH2;
5154
f67115a72b7c init/uninit libvo/ao/getch2/cache2 order fixed
arpi
parents: 5151
diff changeset
1738 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
1739 }
4825
41d2da3bd082 Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents: 4818
diff changeset
1740
5983
4d868c3c9fff some cleanup around uninit()
arpi
parents: 5955
diff changeset
1741 // =================== GUI idle loop (STOP state) ===========================
1745
64247d7d0076 add filename drawing
pontscho
parents: 1738
diff changeset
1742 #ifdef HAVE_NEW_GUI
1787
de6a0987a08d stop fixed, fileselector supp. maybe not work, couldn't test
arpi
parents: 1772
diff changeset
1743 if ( use_gui ) {
8423
c6a1a5b6ba25 - fix three submenu bug
pontscho
parents: 8366
diff changeset
1744 file_format=DEMUXER_TYPE_UNKNOWN;
c6a1a5b6ba25 - fix three submenu bug
pontscho
parents: 8366
diff changeset
1745 guiGetEvent( guiSetDefaults,0 );
5665
3e7f39c4110c fix dvd playing under gui
pontscho
parents: 5655
diff changeset
1746 while ( guiIntfStruct.Playing != 1 )
3e7f39c4110c fix dvd playing under gui
pontscho
parents: 5655
diff changeset
1747 {
4858
65730cea02e7 add half new input support for gui
pontscho
parents: 4856
diff changeset
1748 mp_cmd_t* cmd;
9464
a4e50ab9ac14 3x10l found by Dan Christiansen <danchr@daimi.au.dk>
alex
parents: 9380
diff changeset
1749 usec_sleep(20000);
4798
c39affa2b376 new interface ? :)
pontscho
parents: 4788
diff changeset
1750 guiEventHandling();
6619
f554e7271587 fix volume handling ( step 2 ) -- add balance support and some code cleanup and fix
pontscho
parents: 6590
diff changeset
1751 guiGetEvent( guiReDraw,NULL );
13603
80fc8f48f14c Do not loose commands while paused.
reimar
parents: 13577
diff changeset
1752 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
1753 }
8423
c6a1a5b6ba25 - fix three submenu bug
pontscho
parents: 8366
diff changeset
1754 guiGetEvent( guiSetParameters,NULL );
c6a1a5b6ba25 - fix three submenu bug
pontscho
parents: 8366
diff changeset
1755 if ( guiIntfStruct.StreamType == STREAMTYPE_STREAM )
3543
5a11cbf8791f some small sub bug fix
pontscho
parents: 3540
diff changeset
1756 {
4950
307a94037c5c bazmeg a playtree - t
pontscho
parents: 4940
diff changeset
1757 play_tree_t * entry = play_tree_new();
307a94037c5c bazmeg a playtree - t
pontscho
parents: 4940
diff changeset
1758 play_tree_add_file( entry,guiIntfStruct.Filename );
4974
5da7b1522a9f small bug fixed and workarounds :(
pontscho
parents: 4965
diff changeset
1759 if ( playtree ) play_tree_free_list( playtree->child,1 );
5da7b1522a9f small bug fixed and workarounds :(
pontscho
parents: 4965
diff changeset
1760 else playtree=play_tree_new();
5da7b1522a9f small bug fixed and workarounds :(
pontscho
parents: 4965
diff changeset
1761 play_tree_set_child( playtree,entry );
5da7b1522a9f small bug fixed and workarounds :(
pontscho
parents: 4965
diff changeset
1762 if(playtree)
4950
307a94037c5c bazmeg a playtree - t
pontscho
parents: 4940
diff changeset
1763 {
4974
5da7b1522a9f small bug fixed and workarounds :(
pontscho
parents: 4965
diff changeset
1764 playtree_iter = play_tree_iter_new(playtree,mconfig);
4950
307a94037c5c bazmeg a playtree - t
pontscho
parents: 4940
diff changeset
1765 if(playtree_iter)
307a94037c5c bazmeg a playtree - t
pontscho
parents: 4940
diff changeset
1766 {
307a94037c5c bazmeg a playtree - t
pontscho
parents: 4940
diff changeset
1767 if(play_tree_iter_step(playtree_iter,0,0) != PLAY_TREE_ITER_ENTRY)
307a94037c5c bazmeg a playtree - t
pontscho
parents: 4940
diff changeset
1768 {
307a94037c5c bazmeg a playtree - t
pontscho
parents: 4940
diff changeset
1769 play_tree_iter_free(playtree_iter);
307a94037c5c bazmeg a playtree - t
pontscho
parents: 4940
diff changeset
1770 playtree_iter = NULL;
307a94037c5c bazmeg a playtree - t
pontscho
parents: 4940
diff changeset
1771 }
307a94037c5c bazmeg a playtree - t
pontscho
parents: 4940
diff changeset
1772 filename = play_tree_iter_get_file(playtree_iter,1);
307a94037c5c bazmeg a playtree - t
pontscho
parents: 4940
diff changeset
1773 }
307a94037c5c bazmeg a playtree - t
pontscho
parents: 4940
diff changeset
1774 }
4974
5da7b1522a9f small bug fixed and workarounds :(
pontscho
parents: 4965
diff changeset
1775 }
1787
de6a0987a08d stop fixed, fileselector supp. maybe not work, couldn't test
arpi
parents: 1772
diff changeset
1776 }
16490
f17b3c152fd6 Add comments to a few #endif statements in order to make clear which
diego
parents: 16489
diff changeset
1777 #endif /* HAVE_NEW_GUI */
16347
da2926d990ce Adds -idle, an option to make MPlayer wait for input ('loadfile' or
ods15
parents: 16346
diff changeset
1778
da2926d990ce Adds -idle, an option to make MPlayer wait for input ('loadfile' or
ods15
parents: 16346
diff changeset
1779 while (player_idle_mode && !filename) {
da2926d990ce Adds -idle, an option to make MPlayer wait for input ('loadfile' or
ods15
parents: 16346
diff changeset
1780 play_tree_t * entry = NULL;
da2926d990ce Adds -idle, an option to make MPlayer wait for input ('loadfile' or
ods15
parents: 16346
diff changeset
1781 mp_cmd_t * cmd;
da2926d990ce Adds -idle, an option to make MPlayer wait for input ('loadfile' or
ods15
parents: 16346
diff changeset
1782 while (!(cmd = mp_input_get_cmd(0,1,0))) { // wait for command
da2926d990ce Adds -idle, an option to make MPlayer wait for input ('loadfile' or
ods15
parents: 16346
diff changeset
1783 if (video_out && vo_config_count) video_out->check_events();
da2926d990ce Adds -idle, an option to make MPlayer wait for input ('loadfile' or
ods15
parents: 16346
diff changeset
1784 usec_sleep(20000);
da2926d990ce Adds -idle, an option to make MPlayer wait for input ('loadfile' or
ods15
parents: 16346
diff changeset
1785 }
da2926d990ce Adds -idle, an option to make MPlayer wait for input ('loadfile' or
ods15
parents: 16346
diff changeset
1786 switch (cmd->id) {
da2926d990ce Adds -idle, an option to make MPlayer wait for input ('loadfile' or
ods15
parents: 16346
diff changeset
1787 case MP_CMD_LOADFILE:
da2926d990ce Adds -idle, an option to make MPlayer wait for input ('loadfile' or
ods15
parents: 16346
diff changeset
1788 // prepare a tree entry with the new filename
da2926d990ce Adds -idle, an option to make MPlayer wait for input ('loadfile' or
ods15
parents: 16346
diff changeset
1789 entry = play_tree_new();
da2926d990ce Adds -idle, an option to make MPlayer wait for input ('loadfile' or
ods15
parents: 16346
diff changeset
1790 play_tree_add_file(entry, cmd->args[0].v.s);
da2926d990ce Adds -idle, an option to make MPlayer wait for input ('loadfile' or
ods15
parents: 16346
diff changeset
1791 // actual entering the entry into the main playtree done after switch()
da2926d990ce Adds -idle, an option to make MPlayer wait for input ('loadfile' or
ods15
parents: 16346
diff changeset
1792 break;
da2926d990ce Adds -idle, an option to make MPlayer wait for input ('loadfile' or
ods15
parents: 16346
diff changeset
1793 case MP_CMD_LOADLIST:
da2926d990ce Adds -idle, an option to make MPlayer wait for input ('loadfile' or
ods15
parents: 16346
diff changeset
1794 entry = parse_playlist_file(cmd->args[0].v.s);
da2926d990ce Adds -idle, an option to make MPlayer wait for input ('loadfile' or
ods15
parents: 16346
diff changeset
1795 break;
da2926d990ce Adds -idle, an option to make MPlayer wait for input ('loadfile' or
ods15
parents: 16346
diff changeset
1796 case MP_CMD_QUIT:
da2926d990ce Adds -idle, an option to make MPlayer wait for input ('loadfile' or
ods15
parents: 16346
diff changeset
1797 exit_player_with_rc(MSGTR_Exit_quit, (cmd->nargs > 0)? cmd->args[0].v.i : 0);
da2926d990ce Adds -idle, an option to make MPlayer wait for input ('loadfile' or
ods15
parents: 16346
diff changeset
1798 break;
da2926d990ce Adds -idle, an option to make MPlayer wait for input ('loadfile' or
ods15
parents: 16346
diff changeset
1799 }
da2926d990ce Adds -idle, an option to make MPlayer wait for input ('loadfile' or
ods15
parents: 16346
diff changeset
1800
da2926d990ce Adds -idle, an option to make MPlayer wait for input ('loadfile' or
ods15
parents: 16346
diff changeset
1801 mp_cmd_free(cmd);
da2926d990ce Adds -idle, an option to make MPlayer wait for input ('loadfile' or
ods15
parents: 16346
diff changeset
1802
da2926d990ce Adds -idle, an option to make MPlayer wait for input ('loadfile' or
ods15
parents: 16346
diff changeset
1803 if (entry) { // user entered a command that gave a valid entry
da2926d990ce Adds -idle, an option to make MPlayer wait for input ('loadfile' or
ods15
parents: 16346
diff changeset
1804 if (playtree) // the playtree is always a node with one child. let's clear it
da2926d990ce Adds -idle, an option to make MPlayer wait for input ('loadfile' or
ods15
parents: 16346
diff changeset
1805 play_tree_free_list(playtree->child, 1);
da2926d990ce Adds -idle, an option to make MPlayer wait for input ('loadfile' or
ods15
parents: 16346
diff changeset
1806 else playtree=play_tree_new(); // .. or make a brand new playtree
da2926d990ce Adds -idle, an option to make MPlayer wait for input ('loadfile' or
ods15
parents: 16346
diff changeset
1807
da2926d990ce Adds -idle, an option to make MPlayer wait for input ('loadfile' or
ods15
parents: 16346
diff changeset
1808 if (!playtree) continue; // couldn't make playtree! wait for next command
da2926d990ce Adds -idle, an option to make MPlayer wait for input ('loadfile' or
ods15
parents: 16346
diff changeset
1809
da2926d990ce Adds -idle, an option to make MPlayer wait for input ('loadfile' or
ods15
parents: 16346
diff changeset
1810 play_tree_set_child(playtree, entry);
da2926d990ce Adds -idle, an option to make MPlayer wait for input ('loadfile' or
ods15
parents: 16346
diff changeset
1811
da2926d990ce Adds -idle, an option to make MPlayer wait for input ('loadfile' or
ods15
parents: 16346
diff changeset
1812 playtree_iter = play_tree_iter_new(playtree, mconfig); // make iterator starting at top of tree
da2926d990ce Adds -idle, an option to make MPlayer wait for input ('loadfile' or
ods15
parents: 16346
diff changeset
1813 if (!playtree_iter) continue;
da2926d990ce Adds -idle, an option to make MPlayer wait for input ('loadfile' or
ods15
parents: 16346
diff changeset
1814
da2926d990ce Adds -idle, an option to make MPlayer wait for input ('loadfile' or
ods15
parents: 16346
diff changeset
1815 // find the first real item in the tree
da2926d990ce Adds -idle, an option to make MPlayer wait for input ('loadfile' or
ods15
parents: 16346
diff changeset
1816 if (play_tree_iter_step(playtree_iter,0,0) != PLAY_TREE_ITER_ENTRY) {
da2926d990ce Adds -idle, an option to make MPlayer wait for input ('loadfile' or
ods15
parents: 16346
diff changeset
1817 // no items!
da2926d990ce Adds -idle, an option to make MPlayer wait for input ('loadfile' or
ods15
parents: 16346
diff changeset
1818 play_tree_iter_free(playtree_iter);
da2926d990ce Adds -idle, an option to make MPlayer wait for input ('loadfile' or
ods15
parents: 16346
diff changeset
1819 playtree_iter = NULL;
da2926d990ce Adds -idle, an option to make MPlayer wait for input ('loadfile' or
ods15
parents: 16346
diff changeset
1820 continue; // wait for next command
da2926d990ce Adds -idle, an option to make MPlayer wait for input ('loadfile' or
ods15
parents: 16346
diff changeset
1821 }
da2926d990ce Adds -idle, an option to make MPlayer wait for input ('loadfile' or
ods15
parents: 16346
diff changeset
1822 filename = play_tree_iter_get_file(playtree_iter, 1);
da2926d990ce Adds -idle, an option to make MPlayer wait for input ('loadfile' or
ods15
parents: 16346
diff changeset
1823 }
da2926d990ce Adds -idle, an option to make MPlayer wait for input ('loadfile' or
ods15
parents: 16346
diff changeset
1824 }
5983
4d868c3c9fff some cleanup around uninit()
arpi
parents: 5955
diff changeset
1825 //---------------------------------------------------------------------------
1787
de6a0987a08d stop fixed, fileselector supp. maybe not work, couldn't test
arpi
parents: 1772
diff changeset
1826
1973
5216f108cb4f all error/warn/info messages moved to help_mp-en.h for translation
arpi
parents: 1962
diff changeset
1827 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
1828
5983
4d868c3c9fff some cleanup around uninit()
arpi
parents: 5955
diff changeset
1829 //==================== Open VOB-Sub ============================
4d868c3c9fff some cleanup around uninit()
arpi
parents: 5955
diff changeset
1830
4770
59f8fd64538b autodetect vobsub filename, disable autosub if vobsub found.
atmos4
parents: 4754
diff changeset
1831 current_module="vobsub";
59f8fd64538b autodetect vobsub filename, disable autosub if vobsub found.
atmos4
parents: 4754
diff changeset
1832 if (vobsub_name){
6110
7bea806b9c5f Improvment for spu subtitles.
albeu
parents: 6082
diff changeset
1833 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
1834 if(vo_vobsub==NULL)
59f8fd64538b autodetect vobsub filename, disable autosub if vobsub found.
atmos4
parents: 4754
diff changeset
1835 mp_msg(MSGT_CPLAYER,MSGL_ERR,MSGTR_CantLoadSub,vobsub_name);
59f8fd64538b autodetect vobsub filename, disable autosub if vobsub found.
atmos4
parents: 4754
diff changeset
1836 }else if(sub_auto && filename && (strlen(filename)>=5)){
59f8fd64538b autodetect vobsub filename, disable autosub if vobsub found.
atmos4
parents: 4754
diff changeset
1837 /* try to autodetect vobsub from movie filename ::atmos */
16897
ed8e079a1705 Autoload vobsub's from ~/.mplayer/sub
albeu
parents: 16788
diff changeset
1838 char *buf = malloc((strlen(filename)-3) * sizeof(char)),*psub;
4770
59f8fd64538b autodetect vobsub filename, disable autosub if vobsub found.
atmos4
parents: 4754
diff changeset
1839 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
1840 strncpy(buf, filename, strlen(filename)-4);
6110
7bea806b9c5f Improvment for spu subtitles.
albeu
parents: 6082
diff changeset
1841 vo_vobsub=vobsub_open(buf,spudec_ifo,0,&vo_spudec);
16897
ed8e079a1705 Autoload vobsub's from ~/.mplayer/sub
albeu
parents: 16788
diff changeset
1842 /* try from ~/.mplayer/sub */
ed8e079a1705 Autoload vobsub's from ~/.mplayer/sub
albeu
parents: 16788
diff changeset
1843 if(!vo_vobsub && (psub = get_path( "sub/" ))) {
ed8e079a1705 Autoload vobsub's from ~/.mplayer/sub
albeu
parents: 16788
diff changeset
1844 char *bname;
ed8e079a1705 Autoload vobsub's from ~/.mplayer/sub
albeu
parents: 16788
diff changeset
1845 int l;
ed8e079a1705 Autoload vobsub's from ~/.mplayer/sub
albeu
parents: 16788
diff changeset
1846 bname = strrchr(buf,'/');
ed8e079a1705 Autoload vobsub's from ~/.mplayer/sub
albeu
parents: 16788
diff changeset
1847 #ifdef WIN32
ed8e079a1705 Autoload vobsub's from ~/.mplayer/sub
albeu
parents: 16788
diff changeset
1848 if(!bname) bname = strrchr(buf,'\\');
ed8e079a1705 Autoload vobsub's from ~/.mplayer/sub
albeu
parents: 16788
diff changeset
1849 #endif
ed8e079a1705 Autoload vobsub's from ~/.mplayer/sub
albeu
parents: 16788
diff changeset
1850 if(bname) bname++;
ed8e079a1705 Autoload vobsub's from ~/.mplayer/sub
albeu
parents: 16788
diff changeset
1851 else bname = buf;
ed8e079a1705 Autoload vobsub's from ~/.mplayer/sub
albeu
parents: 16788
diff changeset
1852 l = strlen(psub) + strlen(bname) + 1;
ed8e079a1705 Autoload vobsub's from ~/.mplayer/sub
albeu
parents: 16788
diff changeset
1853 psub = realloc(psub,l);
ed8e079a1705 Autoload vobsub's from ~/.mplayer/sub
albeu
parents: 16788
diff changeset
1854 strcat(psub,bname);
ed8e079a1705 Autoload vobsub's from ~/.mplayer/sub
albeu
parents: 16788
diff changeset
1855 vo_vobsub=vobsub_open(psub,spudec_ifo,0,&vo_spudec);
ed8e079a1705 Autoload vobsub's from ~/.mplayer/sub
albeu
parents: 16788
diff changeset
1856 free(psub);
ed8e079a1705 Autoload vobsub's from ~/.mplayer/sub
albeu
parents: 16788
diff changeset
1857 }
4770
59f8fd64538b autodetect vobsub filename, disable autosub if vobsub found.
atmos4
parents: 4754
diff changeset
1858 free(buf);
59f8fd64538b autodetect vobsub filename, disable autosub if vobsub found.
atmos4
parents: 4754
diff changeset
1859 }
7621
7caeb275ad26 uninit cleanup again... thx to Nilmoni Deb for bugreport
arpi
parents: 7614
diff changeset
1860 if(vo_vobsub){
7caeb275ad26 uninit cleanup again... thx to Nilmoni Deb for bugreport
arpi
parents: 7614
diff changeset
1861 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
1862 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
1863 // 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
1864 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
1865
a5004eb92a79 fix sub_select fiasco with global sub numbering. now multiple sub sources can be managed in essentially one list.
joey
parents: 13500
diff changeset
1866 // 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
1867 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
1868 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
1869 }
4770
59f8fd64538b autodetect vobsub filename, disable autosub if vobsub found.
atmos4
parents: 4754
diff changeset
1870
5151
610d399f50c3 - cleanup pass 1. more to come soon...
arpi
parents: 5138
diff changeset
1871 //============ Open & Sync STREAM --- fork cache2 ====================
610d399f50c3 - cleanup pass 1. more to come soon...
arpi
parents: 5138
diff changeset
1872
5983
4d868c3c9fff some cleanup around uninit()
arpi
parents: 5955
diff changeset
1873 stream=NULL;
4d868c3c9fff some cleanup around uninit()
arpi
parents: 5955
diff changeset
1874 demuxer=NULL;
10959
905acfd20c59 fix a memory leak when playing several files in a row (playlist for instance)
pl
parents: 10953
diff changeset
1875 if (d_audio) {
10997
2f7c74ce8c9a 1000l to pl, this made mplayer crash when playing playlists longer
rfelker
parents: 10959
diff changeset
1876 //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
1877 d_audio=NULL;
905acfd20c59 fix a memory leak when playing several files in a row (playlist for instance)
pl
parents: 10953
diff changeset
1878 }
905acfd20c59 fix a memory leak when playing several files in a row (playlist for instance)
pl
parents: 10953
diff changeset
1879 if (d_video) {
10997
2f7c74ce8c9a 1000l to pl, this made mplayer crash when playing playlists longer
rfelker
parents: 10959
diff changeset
1880 //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
1881 d_video=NULL;
905acfd20c59 fix a memory leak when playing several files in a row (playlist for instance)
pl
parents: 10953
diff changeset
1882 }
5983
4d868c3c9fff some cleanup around uninit()
arpi
parents: 5955
diff changeset
1883 sh_audio=NULL;
4d868c3c9fff some cleanup around uninit()
arpi
parents: 5955
diff changeset
1884 sh_video=NULL;
4d868c3c9fff some cleanup around uninit()
arpi
parents: 5955
diff changeset
1885
1639
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
1886 current_module="open_stream";
9752
3db72324a0fe Stream cleanup, don't use blah_on options anymore.
albeu
parents: 9695
diff changeset
1887 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
1888 if(!stream) { // error...
4825
41d2da3bd082 Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents: 4818
diff changeset
1889 eof = libmpdemux_was_interrupted(PT_NEXT_ENTRY);
41d2da3bd082 Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents: 4818
diff changeset
1890 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
1891 }
2321
5413f4fc560f uninit stream
arpi
parents: 2314
diff changeset
1892 inited_flags|=INITED_STREAM;
5151
610d399f50c3 - cleanup pass 1. more to come soon...
arpi
parents: 5138
diff changeset
1893
8423
c6a1a5b6ba25 - fix three submenu bug
pontscho
parents: 8366
diff changeset
1894 #ifdef HAVE_NEW_GUI
c6a1a5b6ba25 - fix three submenu bug
pontscho
parents: 8366
diff changeset
1895 if ( use_gui ) guiGetEvent( guiSetStream,(char *)stream );
c6a1a5b6ba25 - fix three submenu bug
pontscho
parents: 8366
diff changeset
1896 #endif
c6a1a5b6ba25 - fix three submenu bug
pontscho
parents: 8366
diff changeset
1897
9752
3db72324a0fe Stream cleanup, don't use blah_on options anymore.
albeu
parents: 9695
diff changeset
1898 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
1899 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
1900 // Handle playlist
5151
610d399f50c3 - cleanup pass 1. more to come soon...
arpi
parents: 5138
diff changeset
1901 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
1902 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
1903 entry = parse_playtree(stream,0);
5c15777f1c07 this patch adds an fallback to playlist (any but the plaintext-list format)
arpi
parents: 8913
diff changeset
1904 eof=playtree_add_playlist(entry);
4825
41d2da3bd082 Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents: 4818
diff changeset
1905 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
1906 }
1497
ad4d402b3d29 seek.c moved to demuxer.c, stream_reset in new_demuxer()
arpi
parents: 1496
diff changeset
1907 stream->start_pos+=seek_to_byte;
598
c7117e17e20b OSD seekbar fixed for mpeg/VCD
arpi_esp
parents: 595
diff changeset
1908
3257
b59502557e39 -dumpstream
arpi
parents: 3234
diff changeset
1909 if(stream_dump_type==5){
b59502557e39 -dumpstream
arpi
parents: 3234
diff changeset
1910 unsigned char buf[4096];
b59502557e39 -dumpstream
arpi
parents: 3234
diff changeset
1911 int len;
b59502557e39 -dumpstream
arpi
parents: 3234
diff changeset
1912 FILE *f;
5151
610d399f50c3 - cleanup pass 1. more to come soon...
arpi
parents: 5138
diff changeset
1913 current_module="dumpstream";
7204
eee464fa02c1 fix cache disable for live.com
atmos4
parents: 7202
diff changeset
1914 if(stream->type==STREAMTYPE_STREAM && stream->fd<0){
13577
606d90e03a2f printf --> mp_msg conversion
diego
parents: 13502
diff changeset
1915 mp_msg(MSGT_CPLAYER,MSGL_FATAL,MSGTR_DumpstreamFdUnavailable);
7204
eee464fa02c1 fix cache disable for live.com
atmos4
parents: 7202
diff changeset
1916 exit_player(MSGTR_Exit_error);
eee464fa02c1 fix cache disable for live.com
atmos4
parents: 7202
diff changeset
1917 }
3257
b59502557e39 -dumpstream
arpi
parents: 3234
diff changeset
1918 stream_reset(stream);
b59502557e39 -dumpstream
arpi
parents: 3234
diff changeset
1919 stream_seek(stream,stream->start_pos);
b59502557e39 -dumpstream
arpi
parents: 3234
diff changeset
1920 f=fopen(stream_dump_name,"wb");
b59502557e39 -dumpstream
arpi
parents: 3234
diff changeset
1921 if(!f){
b59502557e39 -dumpstream
arpi
parents: 3234
diff changeset
1922 mp_msg(MSGT_CPLAYER,MSGL_FATAL,MSGTR_CantOpenDumpfile);
b59502557e39 -dumpstream
arpi
parents: 3234
diff changeset
1923 exit_player(MSGTR_Exit_error);
b59502557e39 -dumpstream
arpi
parents: 3234
diff changeset
1924 }
b59502557e39 -dumpstream
arpi
parents: 3234
diff changeset
1925 while(!stream->eof){
b59502557e39 -dumpstream
arpi
parents: 3234
diff changeset
1926 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
1927 if(len>0) {
785c945f6796 check for -dumpstream file writes, patch by Eric Lammerts <eric@lammerts.org>
alex
parents: 10223
diff changeset
1928 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
1929 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
1930 exit_player(MSGTR_Exit_error);
785c945f6796 check for -dumpstream file writes, patch by Eric Lammerts <eric@lammerts.org>
alex
parents: 10223
diff changeset
1931 }
785c945f6796 check for -dumpstream file writes, patch by Eric Lammerts <eric@lammerts.org>
alex
parents: 10223
diff changeset
1932 }
3257
b59502557e39 -dumpstream
arpi
parents: 3234
diff changeset
1933 }
10225
785c945f6796 check for -dumpstream file writes, patch by Eric Lammerts <eric@lammerts.org>
alex
parents: 10223
diff changeset
1934 if(fclose(f)) {
785c945f6796 check for -dumpstream file writes, patch by Eric Lammerts <eric@lammerts.org>
alex
parents: 10223
diff changeset
1935 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
1936 exit_player(MSGTR_Exit_error);
785c945f6796 check for -dumpstream file writes, patch by Eric Lammerts <eric@lammerts.org>
alex
parents: 10223
diff changeset
1937 }
3257
b59502557e39 -dumpstream
arpi
parents: 3234
diff changeset
1938 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
1939 exit_player_with_rc(MSGTR_Exit_eof, 0);
3257
b59502557e39 -dumpstream
arpi
parents: 3234
diff changeset
1940 }
b59502557e39 -dumpstream
arpi
parents: 3234
diff changeset
1941
4274
f5759bbdd7be -alang/-slang fixed
arpi
parents: 4260
diff changeset
1942 #ifdef USE_DVDREAD
5425
f3a451b6f794 -alang sig11 when playing avis fixed - 10l
arpi
parents: 5411
diff changeset
1943 if(stream->type==STREAMTYPE_DVD){
f3a451b6f794 -alang sig11 when playing avis fixed - 10l
arpi
parents: 5411
diff changeset
1944 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
1945 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
1946 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
1947 // 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
1948 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
1949 global_sub_size += dvd_number_of_subs(stream);
5425
f3a451b6f794 -alang sig11 when playing avis fixed - 10l
arpi
parents: 5411
diff changeset
1950 current_module=NULL;
f3a451b6f794 -alang sig11 when playing avis fixed - 10l
arpi
parents: 5411
diff changeset
1951 }
4274
f5759bbdd7be -alang/-slang fixed
arpi
parents: 4260
diff changeset
1952 #endif
f5759bbdd7be -alang/-slang fixed
arpi
parents: 4260
diff changeset
1953
5489
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
1954 #ifdef USE_DVDNAV
9752
3db72324a0fe Stream cleanup, don't use blah_on options anymore.
albeu
parents: 9695
diff changeset
1955 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
1956 #endif
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
1957
5151
610d399f50c3 - cleanup pass 1. more to come soon...
arpi
parents: 5138
diff changeset
1958 // 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
1959 #ifdef HAS_DVBIN_SUPPORT
11352
d8b1f7509df2 Patch by Nico <nsabbi@libero.it>
attila
parents: 11331
diff changeset
1960 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
1961 #endif
7881
aba9301ed3c4 allow cache to be disabled (-nocache should override cachesize autodetection
arpi
parents: 7867
diff changeset
1962 if(stream_cache_size>0){
5151
610d399f50c3 - cleanup pass 1. more to come soon...
arpi
parents: 5138
diff changeset
1963 current_module="enable_cache";
16152
10a69a812eff remove unused cache-prefill and create cache-seek-min that controls when seek_long is prefered over waiting for cache to fill
iive
parents: 16079
diff changeset
1964 if(!stream_enable_cache(stream,stream_cache_size*1024,
10a69a812eff remove unused cache-prefill and create cache-seek-min that controls when seek_long is prefered over waiting for cache to fill
iive
parents: 16079
diff changeset
1965 stream_cache_size*1024*(stream_cache_min_percent / 100.0),
10a69a812eff remove unused cache-prefill and create cache-seek-min that controls when seek_long is prefered over waiting for cache to fill
iive
parents: 16079
diff changeset
1966 stream_cache_size*1024*(stream_cache_seek_min_percent / 100.0)))
5151
610d399f50c3 - cleanup pass 1. more to come soon...
arpi
parents: 5138
diff changeset
1967 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
1968 }
1639
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
1969
5151
610d399f50c3 - cleanup pass 1. more to come soon...
arpi
parents: 5138
diff changeset
1970 //============ Open DEMUXERS --- DETECT file type =======================
1639
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
1971 current_module="demux_open";
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
1972
9006
d00997f12257 extension-based filetype detection for headerless files (mp3 vs mpeg, etc)
arpi
parents: 9003
diff changeset
1973 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
1974
afca652cb0e5 patch adds support for MOV-Reference-Files.
arpi
parents: 8932
diff changeset
1975 // HACK to get MOV Reference Files working
afca652cb0e5 patch adds support for MOV-Reference-Files.
arpi
parents: 8932
diff changeset
1976
afca652cb0e5 patch adds support for MOV-Reference-Files.
arpi
parents: 8932
diff changeset
1977 if (demuxer && demuxer->type==DEMUXER_TYPE_PLAYLIST)
afca652cb0e5 patch adds support for MOV-Reference-Files.
arpi
parents: 8932
diff changeset
1978 {
afca652cb0e5 patch adds support for MOV-Reference-Files.
arpi
parents: 8932
diff changeset
1979 unsigned char* playlist_entry;
afca652cb0e5 patch adds support for MOV-Reference-Files.
arpi
parents: 8932
diff changeset
1980 play_tree_t *list = NULL, *entry = NULL;
afca652cb0e5 patch adds support for MOV-Reference-Files.
arpi
parents: 8932
diff changeset
1981
afca652cb0e5 patch adds support for MOV-Reference-Files.
arpi
parents: 8932
diff changeset
1982 current_module="handle_demux_playlist";
afca652cb0e5 patch adds support for MOV-Reference-Files.
arpi
parents: 8932
diff changeset
1983 while (ds_get_packet(demuxer->video,&playlist_entry)>0)
afca652cb0e5 patch adds support for MOV-Reference-Files.
arpi
parents: 8932
diff changeset
1984 {
afca652cb0e5 patch adds support for MOV-Reference-Files.
arpi
parents: 8932
diff changeset
1985 char *temp, *bname;
afca652cb0e5 patch adds support for MOV-Reference-Files.
arpi
parents: 8932
diff changeset
1986
13577
606d90e03a2f printf --> mp_msg conversion
diego
parents: 13502
diff changeset
1987 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
1988
afca652cb0e5 patch adds support for MOV-Reference-Files.
arpi
parents: 8932
diff changeset
1989 bname=mp_basename(playlist_entry);
afca652cb0e5 patch adds support for MOV-Reference-Files.
arpi
parents: 8932
diff changeset
1990 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
1991 continue;
afca652cb0e5 patch adds support for MOV-Reference-Files.
arpi
parents: 8932
diff changeset
1992
9124
ff773800b598 I also added that a self-reference is not endlessly played ... (Happened
arpi
parents: 9105
diff changeset
1993 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
1994 continue;
ff773800b598 I also added that a self-reference is not endlessly played ... (Happened
arpi
parents: 9105
diff changeset
1995
8937
afca652cb0e5 patch adds support for MOV-Reference-Files.
arpi
parents: 8932
diff changeset
1996 entry = play_tree_new();
afca652cb0e5 patch adds support for MOV-Reference-Files.
arpi
parents: 8932
diff changeset
1997
afca652cb0e5 patch adds support for MOV-Reference-Files.
arpi
parents: 8932
diff changeset
1998 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
1999 {
afca652cb0e5 patch adds support for MOV-Reference-Files.
arpi
parents: 8932
diff changeset
2000 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
2001 if (temp)
afca652cb0e5 patch adds support for MOV-Reference-Files.
arpi
parents: 8932
diff changeset
2002 {
afca652cb0e5 patch adds support for MOV-Reference-Files.
arpi
parents: 8932
diff changeset
2003 strncpy(temp, filename, strlen(filename)-strlen(mp_basename(filename)));
afca652cb0e5 patch adds support for MOV-Reference-Files.
arpi
parents: 8932
diff changeset
2004 temp[strlen(filename)-strlen(mp_basename(filename))]='\0';
afca652cb0e5 patch adds support for MOV-Reference-Files.
arpi
parents: 8932
diff changeset
2005 strcat(temp, playlist_entry);
afca652cb0e5 patch adds support for MOV-Reference-Files.
arpi
parents: 8932
diff changeset
2006 play_tree_add_file(entry,temp);
13577
606d90e03a2f printf --> mp_msg conversion
diego
parents: 13502
diff changeset
2007 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
2008 free(temp);
afca652cb0e5 patch adds support for MOV-Reference-Files.
arpi
parents: 8932
diff changeset
2009 }
afca652cb0e5 patch adds support for MOV-Reference-Files.
arpi
parents: 8932
diff changeset
2010 }
afca652cb0e5 patch adds support for MOV-Reference-Files.
arpi
parents: 8932
diff changeset
2011 else
afca652cb0e5 patch adds support for MOV-Reference-Files.
arpi
parents: 8932
diff changeset
2012 play_tree_add_file(entry,playlist_entry);
afca652cb0e5 patch adds support for MOV-Reference-Files.
arpi
parents: 8932
diff changeset
2013
afca652cb0e5 patch adds support for MOV-Reference-Files.
arpi
parents: 8932
diff changeset
2014 if(!list)
afca652cb0e5 patch adds support for MOV-Reference-Files.
arpi
parents: 8932
diff changeset
2015 list = entry;
afca652cb0e5 patch adds support for MOV-Reference-Files.
arpi
parents: 8932
diff changeset
2016 else
afca652cb0e5 patch adds support for MOV-Reference-Files.
arpi
parents: 8932
diff changeset
2017 play_tree_append_entry(list,entry);
afca652cb0e5 patch adds support for MOV-Reference-Files.
arpi
parents: 8932
diff changeset
2018 }
afca652cb0e5 patch adds support for MOV-Reference-Files.
arpi
parents: 8932
diff changeset
2019 free_demuxer(demuxer);
afca652cb0e5 patch adds support for MOV-Reference-Files.
arpi
parents: 8932
diff changeset
2020 demuxer = NULL;
afca652cb0e5 patch adds support for MOV-Reference-Files.
arpi
parents: 8932
diff changeset
2021
afca652cb0e5 patch adds support for MOV-Reference-Files.
arpi
parents: 8932
diff changeset
2022 if (list)
afca652cb0e5 patch adds support for MOV-Reference-Files.
arpi
parents: 8932
diff changeset
2023 {
afca652cb0e5 patch adds support for MOV-Reference-Files.
arpi
parents: 8932
diff changeset
2024 entry = play_tree_new();
afca652cb0e5 patch adds support for MOV-Reference-Files.
arpi
parents: 8932
diff changeset
2025 play_tree_set_child(entry,list);
afca652cb0e5 patch adds support for MOV-Reference-Files.
arpi
parents: 8932
diff changeset
2026 eof=playtree_add_playlist(entry);
afca652cb0e5 patch adds support for MOV-Reference-Files.
arpi
parents: 8932
diff changeset
2027 goto goto_next_file;
afca652cb0e5 patch adds support for MOV-Reference-Files.
arpi
parents: 8932
diff changeset
2028 }
afca652cb0e5 patch adds support for MOV-Reference-Files.
arpi
parents: 8932
diff changeset
2029 }
afca652cb0e5 patch adds support for MOV-Reference-Files.
arpi
parents: 8932
diff changeset
2030
8925
5c15777f1c07 this patch adds an fallback to playlist (any but the plaintext-list format)
arpi
parents: 8913
diff changeset
2031 if(!demuxer)
5c15777f1c07 this patch adds an fallback to playlist (any but the plaintext-list format)
arpi
parents: 8913
diff changeset
2032 {
10953
70a974306f9b disable code that DOES NOT WORK (it won't load real playlists and
rfelker
parents: 10928
diff changeset
2033 #if 0
8925
5c15777f1c07 this patch adds an fallback to playlist (any but the plaintext-list format)
arpi
parents: 8913
diff changeset
2034 play_tree_t* entry;
5c15777f1c07 this patch adds an fallback to playlist (any but the plaintext-list format)
arpi
parents: 8913
diff changeset
2035 // Handle playlist
5c15777f1c07 this patch adds an fallback to playlist (any but the plaintext-list format)
arpi
parents: 8913
diff changeset
2036 current_module="handle_playlist";
9090
arpi
parents: 9088
diff changeset
2037 switch(stream->type){
arpi
parents: 9088
diff changeset
2038 case STREAMTYPE_VCD:
arpi
parents: 9088
diff changeset
2039 case STREAMTYPE_DVD:
arpi
parents: 9088
diff changeset
2040 case STREAMTYPE_DVDNAV:
arpi
parents: 9088
diff changeset
2041 case STREAMTYPE_CDDA:
arpi
parents: 9088
diff changeset
2042 case STREAMTYPE_VCDBINCUE:
arpi
parents: 9088
diff changeset
2043 // don't try to parse raw media as playlist, it's unlikely
arpi
parents: 9088
diff changeset
2044 goto goto_next_file;
arpi
parents: 9088
diff changeset
2045 }
13577
606d90e03a2f printf --> mp_msg conversion
diego
parents: 13502
diff changeset
2046 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
2047 stream_reset(stream);
5c15777f1c07 this patch adds an fallback to playlist (any but the plaintext-list format)
arpi
parents: 8913
diff changeset
2048 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
2049 entry = parse_playtree(stream,0);
5c15777f1c07 this patch adds an fallback to playlist (any but the plaintext-list format)
arpi
parents: 8913
diff changeset
2050 if(!entry)
5c15777f1c07 this patch adds an fallback to playlist (any but the plaintext-list format)
arpi
parents: 8913
diff changeset
2051 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
2052 else
5c15777f1c07 this patch adds an fallback to playlist (any but the plaintext-list format)
arpi
parents: 8913
diff changeset
2053 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
2054 #endif
8925
5c15777f1c07 this patch adds an fallback to playlist (any but the plaintext-list format)
arpi
parents: 8913
diff changeset
2055 goto goto_next_file;
5c15777f1c07 this patch adds an fallback to playlist (any but the plaintext-list format)
arpi
parents: 8913
diff changeset
2056 }
7058
2e5c07262861 new v4l capture patch by Jindrich Makovicka <makovick@kmlinux.fjfi.cvut.cz>:
arpi
parents: 7055
diff changeset
2057 inited_flags|=INITED_DEMUXER;
2e5c07262861 new v4l capture patch by Jindrich Makovicka <makovick@kmlinux.fjfi.cvut.cz>:
arpi
parents: 7055
diff changeset
2058
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
2059 #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
2060 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
2061 // 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
2062 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
2063 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
2064 }
a5004eb92a79 fix sub_select fiasco with global sub numbering. now multiple sub sources can be managed in essentially one list.
joey
parents: 13500
diff changeset
2065 #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
2066 #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
2067 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
2068 // 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
2069 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
2070 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
2071 }
a5004eb92a79 fix sub_select fiasco with global sub numbering. now multiple sub sources can be managed in essentially one list.
joey
parents: 13500
diff changeset
2072 #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
2073
5175
8354d89498d4 video codec selection redesigned and moved to libmpcodecs - now it's 'intelligent'
arpi
parents: 5154
diff changeset
2074 current_module="demux_open2";
8354d89498d4 video codec selection redesigned and moved to libmpcodecs - now it's 'intelligent'
arpi
parents: 5154
diff changeset
2075
1660
0ed5a9568d0f file_format -> demuxer->file_format
arpi
parents: 1654
diff changeset
2076 //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
2077
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2078 d_audio=demuxer->audio;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2079 d_video=demuxer->video;
554
d8b3c80604e3 dvd sub parser move dto mplayer.c
arpi_esp
parents: 552
diff changeset
2080 d_dvdsub=demuxer->sub;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2081
792
62d7f36e6127 dump stuff moved before header parsing
arpi_esp
parents: 782
diff changeset
2082 // DUMP STREAMS:
6209
e46b3bf16df5 added -dumpsrtsub option for SubRip format
iive
parents: 6204
diff changeset
2083 if((stream_dump_type)&&(stream_dump_type<4)){
792
62d7f36e6127 dump stuff moved before header parsing
arpi_esp
parents: 782
diff changeset
2084 FILE *f;
62d7f36e6127 dump stuff moved before header parsing
arpi_esp
parents: 782
diff changeset
2085 demux_stream_t *ds=NULL;
1639
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
2086 current_module="dump";
792
62d7f36e6127 dump stuff moved before header parsing
arpi_esp
parents: 782
diff changeset
2087 // select stream to dump
62d7f36e6127 dump stuff moved before header parsing
arpi_esp
parents: 782
diff changeset
2088 switch(stream_dump_type){
62d7f36e6127 dump stuff moved before header parsing
arpi_esp
parents: 782
diff changeset
2089 case 1: ds=d_audio;break;
62d7f36e6127 dump stuff moved before header parsing
arpi_esp
parents: 782
diff changeset
2090 case 2: ds=d_video;break;
4335
270cbfe45b30 mpsub dump bug fix. 100l for laaz
pontscho
parents: 4274
diff changeset
2091 case 3: ds=d_dvdsub;break;
792
62d7f36e6127 dump stuff moved before header parsing
arpi_esp
parents: 782
diff changeset
2092 }
62d7f36e6127 dump stuff moved before header parsing
arpi_esp
parents: 782
diff changeset
2093 if(!ds){
7805
f71bc57c4da9 Fixed two typos noticed by Sycotic Smith (I think).
diego
parents: 7790
diff changeset
2094 mp_msg(MSGT_CPLAYER,MSGL_FATAL,MSGTR_DumpSelectedStreamMissing);
1639
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
2095 exit_player(MSGTR_Exit_error);
792
62d7f36e6127 dump stuff moved before header parsing
arpi_esp
parents: 782
diff changeset
2096 }
62d7f36e6127 dump stuff moved before header parsing
arpi_esp
parents: 782
diff changeset
2097 // disable other streams:
62d7f36e6127 dump stuff moved before header parsing
arpi_esp
parents: 782
diff changeset
2098 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
2099 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
2100 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
2101 // let's dump it!
3257
b59502557e39 -dumpstream
arpi
parents: 3234
diff changeset
2102 f=fopen(stream_dump_name,"wb");
1639
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
2103 if(!f){
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
2104 mp_msg(MSGT_CPLAYER,MSGL_FATAL,MSGTR_CantOpenDumpfile);
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
2105 exit_player(MSGTR_Exit_error);
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
2106 }
792
62d7f36e6127 dump stuff moved before header parsing
arpi_esp
parents: 782
diff changeset
2107 while(!ds->eof){
62d7f36e6127 dump stuff moved before header parsing
arpi_esp
parents: 782
diff changeset
2108 unsigned char* start;
62d7f36e6127 dump stuff moved before header parsing
arpi_esp
parents: 782
diff changeset
2109 int in_size=ds_get_packet(ds,&start);
2102
569a5d7b5d8a mov timing fixes (same way as asf)
arpi
parents: 2042
diff changeset
2110 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
2111 && stream_dump_type==2) fwrite(&in_size,1,4,f);
792
62d7f36e6127 dump stuff moved before header parsing
arpi_esp
parents: 782
diff changeset
2112 if(in_size>0) fwrite(start,in_size,1,f);
62d7f36e6127 dump stuff moved before header parsing
arpi_esp
parents: 782
diff changeset
2113 }
62d7f36e6127 dump stuff moved before header parsing
arpi_esp
parents: 782
diff changeset
2114 fclose(f);
1582
12aa68bf2ff5 erros emssages moved to help_mp.h for translation
arpi
parents: 1567
diff changeset
2115 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
2116 exit_player_with_rc(MSGTR_Exit_eof, 0);
792
62d7f36e6127 dump stuff moved before header parsing
arpi_esp
parents: 782
diff changeset
2117 }
62d7f36e6127 dump stuff moved before header parsing
arpi_esp
parents: 782
diff changeset
2118
1375
dbcb5b5e1fae file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents: 1369
diff changeset
2119 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
2120 sh_video=d_video->sh;
792
62d7f36e6127 dump stuff moved before header parsing
arpi_esp
parents: 782
diff changeset
2121
1375
dbcb5b5e1fae file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents: 1369
diff changeset
2122 if(sh_video){
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2123
5151
610d399f50c3 - cleanup pass 1. more to come soon...
arpi
parents: 5138
diff changeset
2124 current_module="video_read_properties";
4587
886bf5274992 Audio only support. Include a fix in the asf demuxer opening.
albeu
parents: 4552
diff changeset
2125 if(!video_read_properties(sh_video)) {
7805
f71bc57c4da9 Fixed two typos noticed by Sycotic Smith (I think).
diego
parents: 7790
diff changeset
2126 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
2127 sh_video=d_video->sh=NULL;
886bf5274992 Audio only support. Include a fix in the asf demuxer opening.
albeu
parents: 4552
diff changeset
2128 } else {
6138
523014df7d32 big cosmetics patch, cleanup of messages printed by mplayer and libs.
arpi
parents: 6135
diff changeset
2129 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
2130 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
2131 sh_video->fps,sh_video->frametime
886bf5274992 Audio only support. Include a fix in the asf demuxer opening.
albeu
parents: 4552
diff changeset
2132 );
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2133
4598
badb76094897 setting vo_fps, required for vo_yuv4mpeg
arpi
parents: 4593
diff changeset
2134 /* 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
2135 if(force_fps){
badb76094897 setting vo_fps, required for vo_yuv4mpeg
arpi
parents: 4593
diff changeset
2136 sh_video->fps=force_fps;
badb76094897 setting vo_fps, required for vo_yuv4mpeg
arpi
parents: 4593
diff changeset
2137 sh_video->frametime=1.0f/sh_video->fps;
badb76094897 setting vo_fps, required for vo_yuv4mpeg
arpi
parents: 4593
diff changeset
2138 }
7562
92188b57a062 video out driver list support (like -vc, example: -vo xmga,xv,x11,)
arpi
parents: 7559
diff changeset
2139 vo_fps = sh_video->fps;
10661
49d7d02f4485 X11_FULLSCREEN vs HAVE_X11 definitions and some warning fixes
alex
parents: 10646
diff changeset
2140 #ifdef HAVE_X11
7562
92188b57a062 video out driver list support (like -vc, example: -vo xmga,xv,x11,)
arpi
parents: 7559
diff changeset
2141 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
2142 #endif
4598
badb76094897 setting vo_fps, required for vo_yuv4mpeg
arpi
parents: 4593
diff changeset
2143
4587
886bf5274992 Audio only support. Include a fix in the asf demuxer opening.
albeu
parents: 4552
diff changeset
2144 if(!sh_video->fps && !force_fps){
886bf5274992 Audio only support. Include a fix in the asf demuxer opening.
albeu
parents: 4552
diff changeset
2145 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
2146 sh_video=d_video->sh=NULL;
886bf5274992 Audio only support. Include a fix in the asf demuxer opening.
albeu
parents: 4552
diff changeset
2147 }
1375
dbcb5b5e1fae file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents: 1369
diff changeset
2148 }
dbcb5b5e1fae file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents: 1369
diff changeset
2149
dbcb5b5e1fae file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents: 1369
diff changeset
2150 }
398
f5918fc8df10 more cleanup of video decoding
arpi_esp
parents: 396
diff changeset
2151
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2152 fflush(stdout);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2153
4587
886bf5274992 Audio only support. Include a fix in the asf demuxer opening.
albeu
parents: 4552
diff changeset
2154 if(!sh_video && !sh_audio){
6930
cae1dd6343e7 moved messages to help_mp-??.h
jaf
parents: 6921
diff changeset
2155 mp_msg(MSGT_CPLAYER,MSGL_FATAL, MSGTR_NoStreamFound);
10708
a57e8d980652 This patch fixes:
alex
parents: 10707
diff changeset
2156 #ifdef HAS_DVBIN_SUPPORT
a57e8d980652 This patch fixes:
alex
parents: 10707
diff changeset
2157 if((stream->type == STREAMTYPE_DVB) && stream->priv)
a57e8d980652 This patch fixes:
alex
parents: 10707
diff changeset
2158 {
a57e8d980652 This patch fixes:
alex
parents: 10707
diff changeset
2159 dvb_priv_t *priv = (dvb_priv_t*) stream->priv;
a57e8d980652 This patch fixes:
alex
parents: 10707
diff changeset
2160 if(priv->is_on)
a57e8d980652 This patch fixes:
alex
parents: 10707
diff changeset
2161 {
a57e8d980652 This patch fixes:
alex
parents: 10707
diff changeset
2162 int dir;
a57e8d980652 This patch fixes:
alex
parents: 10707
diff changeset
2163 int v = last_dvb_step;
a57e8d980652 This patch fixes:
alex
parents: 10707
diff changeset
2164 if(v > 0)
a57e8d980652 This patch fixes:
alex
parents: 10707
diff changeset
2165 dir = DVB_CHANNEL_HIGHER;
a57e8d980652 This patch fixes:
alex
parents: 10707
diff changeset
2166 else
a57e8d980652 This patch fixes:
alex
parents: 10707
diff changeset
2167 dir = DVB_CHANNEL_LOWER;
a57e8d980652 This patch fixes:
alex
parents: 10707
diff changeset
2168
a57e8d980652 This patch fixes:
alex
parents: 10707
diff changeset
2169 if(dvb_step_channel(priv, dir))
a57e8d980652 This patch fixes:
alex
parents: 10707
diff changeset
2170 {
a57e8d980652 This patch fixes:
alex
parents: 10707
diff changeset
2171 uninit_player(INITED_ALL-(INITED_STREAM|INITED_INPUT));
11352
d8b1f7509df2 Patch by Nico <nsabbi@libero.it>
attila
parents: 11331
diff changeset
2172 cache_uninit(stream);
d8b1f7509df2 Patch by Nico <nsabbi@libero.it>
attila
parents: 11331
diff changeset
2173 goto goto_enable_cache;
10708
a57e8d980652 This patch fixes:
alex
parents: 10707
diff changeset
2174 }
a57e8d980652 This patch fixes:
alex
parents: 10707
diff changeset
2175 }
a57e8d980652 This patch fixes:
alex
parents: 10707
diff changeset
2176 }
a57e8d980652 This patch fixes:
alex
parents: 10707
diff changeset
2177 #endif
1641
b7dae998505c free stream/demuxer. continue playback with next file if error found
arpi
parents: 1639
diff changeset
2178 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
2179 }
13c0dfde813b removed dummy audio track for -nosound, vo: flip detection
arpi_esp
parents: 766
diff changeset
2180
5151
610d399f50c3 - cleanup pass 1. more to come soon...
arpi
parents: 5138
diff changeset
2181 /* display clip info */
610d399f50c3 - cleanup pass 1. more to come soon...
arpi
parents: 5138
diff changeset
2182 demux_info_print(demuxer);
610d399f50c3 - cleanup pass 1. more to come soon...
arpi
parents: 5138
diff changeset
2183
610d399f50c3 - cleanup pass 1. more to come soon...
arpi
parents: 5138
diff changeset
2184 //================== Read SUBTITLES (DVD & TEXT) ==========================
14188
0180a7f96197 Hopefully fixes problems with non-working vobsubs.
reimar
parents: 14172
diff changeset
2185 if(vo_spudec==NULL && sh_video &&
0180a7f96197 Hopefully fixes problems with non-working vobsubs.
reimar
parents: 14172
diff changeset
2186 (stream->type==STREAMTYPE_DVD || demuxer->type==DEMUXER_TYPE_MATROSKA ||
0180a7f96197 Hopefully fixes problems with non-working vobsubs.
reimar
parents: 14172
diff changeset
2187 d_dvdsub->id >= 0)){
4587
886bf5274992 Audio only support. Include a fix in the asf demuxer opening.
albeu
parents: 4552
diff changeset
2188
5388
3af2729c5c87 * New command line switch for mplayer & mencoder:
kmkaplan
parents: 5380
diff changeset
2189 if (spudec_ifo) {
3af2729c5c87 * New command line switch for mplayer & mencoder:
kmkaplan
parents: 5380
diff changeset
2190 unsigned int palette[16], width, height;
5489
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
2191 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
2192 if (vobsub_parse_ifo(NULL,spudec_ifo, palette, &width, &height, 1, -1, NULL) >= 0)
7790
kmkaplan
parents: 7780
diff changeset
2193 vo_spudec=spudec_new_scaled(palette, width, height);
5388
3af2729c5c87 * New command line switch for mplayer & mencoder:
kmkaplan
parents: 5380
diff changeset
2194 }
3af2729c5c87 * New command line switch for mplayer & mencoder:
kmkaplan
parents: 5380
diff changeset
2195
5489
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
2196 #ifdef USE_DVDNAV
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
2197 if (vo_spudec==NULL && stream->type==STREAMTYPE_DVDNAV) {
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
2198 current_module="spudec_init_dvdnav";
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
2199 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
2200 sh_video->disp_w, sh_video->disp_h);
5411
6918c74caa4d 1 step closed to solving memory corruptions
arpi
parents: 5410
diff changeset
2201 }
6918c74caa4d 1 step closed to solving memory corruptions
arpi
parents: 5410
diff changeset
2202 #endif
5489
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
2203
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
2204 #ifdef USE_DVDREAD
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
2205 if (vo_spudec==NULL && stream->type==STREAMTYPE_DVD) {
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
2206 current_module="spudec_init_dvdread";
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
2207 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
2208 sh_video->disp_w, sh_video->disp_h);
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
2209 }
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
2210 #endif
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
2211
11153
cb82b062188f Support for VobSub-in-Matroska; parts outside of demux_mkv.cpp.
mosu
parents: 10997
diff changeset
2212 #ifdef HAVE_MATROSKA
cb82b062188f Support for VobSub-in-Matroska; parts outside of demux_mkv.cpp.
mosu
parents: 10997
diff changeset
2213 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
2214 (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
2215 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
2216 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
2217 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
2218 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
2219 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
2220 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
2221 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
2222 }
cb82b062188f Support for VobSub-in-Matroska; parts outside of demux_mkv.cpp.
mosu
parents: 10997
diff changeset
2223 #endif
cb82b062188f Support for VobSub-in-Matroska; parts outside of demux_mkv.cpp.
mosu
parents: 10997
diff changeset
2224
5489
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
2225 if (vo_spudec==NULL) {
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
2226 current_module="spudec_init_normal";
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
2227 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
2228 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
2229 }
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
2230
4087
07d831705ec6 Support software scaling with DVD subtitles
kmkaplan
parents: 4079
diff changeset
2231 if (vo_spudec!=NULL)
07d831705ec6 Support software scaling with DVD subtitles
kmkaplan
parents: 4079
diff changeset
2232 inited_flags|=INITED_SPUDEC;
4274
f5759bbdd7be -alang/-slang fixed
arpi
parents: 4260
diff changeset
2233
6110
7bea806b9c5f Improvment for spu subtitles.
albeu
parents: 6082
diff changeset
2234 }
7bea806b9c5f Improvment for spu subtitles.
albeu
parents: 6082
diff changeset
2235
10917
d45870f67728 Forced subtitles patch by Arne Driescher <driescher@mpi-magdeburg.mpg.de>
attila
parents: 10884
diff changeset
2236 // Apply current settings for forced subs
d45870f67728 Forced subtitles patch by Arne Driescher <driescher@mpi-magdeburg.mpg.de>
attila
parents: 10884
diff changeset
2237 if (vo_spudec!=NULL)
d45870f67728 Forced subtitles patch by Arne Driescher <driescher@mpi-magdeburg.mpg.de>
attila
parents: 10884
diff changeset
2238 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
2239
4052
505f206d80d1 corrections to adjust_subs_time function which now uses fps if needed
atlka
parents: 4045
diff changeset
2240 #ifdef USE_SUB
6110
7bea806b9c5f Improvment for spu subtitles.
albeu
parents: 6082
diff changeset
2241 if(sh_video) {
4064
3c747168eb6e 1. subs know are readed after reading AVI header so we already know fps
atlka
parents: 4052
diff changeset
2242 // 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
2243 // 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
2244 // check .sub
5151
610d399f50c3 - cleanup pass 1. more to come soon...
arpi
parents: 5138
diff changeset
2245 current_module="read_subtitles_file";
610d399f50c3 - cleanup pass 1. more to come soon...
arpi
parents: 5138
diff changeset
2246 if(sub_name){
9870
09d630a4f991 support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents: 9831
diff changeset
2247 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
2248 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
2249 }
5151
610d399f50c3 - cleanup pass 1. more to come soon...
arpi
parents: 5138
diff changeset
2250 if(sub_auto) { // auto load sub file ...
11767
e6db1c939c25 prevent sig11 when $HOME is not set
attila
parents: 11759
diff changeset
2251 char *psub = get_path( "sub/" );
e6db1c939c25 prevent sig11 when $HOME is not set
attila
parents: 11759
diff changeset
2252 char **tmp = sub_filenames((psub ? psub : ""), filename);
15603
2d1ad16b6021 strdup subtitle filename at a more appropriate place, fixing memleaks and
reimar
parents: 15584
diff changeset
2253 int i = 0;
12890
9a45f43bf9a0 false-use-of-get_path() memleak fixes.
al
parents: 12841
diff changeset
2254 free(psub); // release the buffer created by get_path() above
15603
2d1ad16b6021 strdup subtitle filename at a more appropriate place, fixing memleaks and
reimar
parents: 15584
diff changeset
2255 while (tmp[i]) {
2d1ad16b6021 strdup subtitle filename at a more appropriate place, fixing memleaks and
reimar
parents: 15584
diff changeset
2256 add_subtitles (tmp[i], sh_video->fps, 0);
2d1ad16b6021 strdup subtitle filename at a more appropriate place, fixing memleaks and
reimar
parents: 15584
diff changeset
2257 free(tmp[i++]);
2d1ad16b6021 strdup subtitle filename at a more appropriate place, fixing memleaks and
reimar
parents: 15584
diff changeset
2258 }
9870
09d630a4f991 support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents: 9831
diff changeset
2259 free(tmp);
09d630a4f991 support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents: 9831
diff changeset
2260 if (set_of_sub_size == 0)
12893
0c28de2f031f fix segfault when loading subtitles (idea by pl)
rathann
parents: 12890
diff changeset
2261 {
12890
9a45f43bf9a0 false-use-of-get_path() memleak fixes.
al
parents: 12841
diff changeset
2262 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
2263 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
2264 }
4064
3c747168eb6e 1. subs know are readed after reading AVI header so we already know fps
atlka
parents: 4052
diff changeset
2265 }
9870
09d630a4f991 support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents: 9831
diff changeset
2266 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
2267 // 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
2268 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
2269 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
2270 }
5151
610d399f50c3 - cleanup pass 1. more to come soon...
arpi
parents: 5138
diff changeset
2271 }
16490
f17b3c152fd6 Add comments to a few #endif statements in order to make clear which
diego
parents: 16489
diff changeset
2272 #endif /* USE_SUB */
6110
7bea806b9c5f Improvment for spu subtitles.
albeu
parents: 6082
diff changeset
2273
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
2274 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
2275 // 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
2276 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
2277 // 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
2278 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
2279 } 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
2280 // 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
2281 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
2282 } 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
2283 // 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
2284 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
2285 /*
a5004eb92a79 fix sub_select fiasco with global sub numbering. now multiple sub sources can be managed in essentially one list.
joey
parents: 13500
diff changeset
2286 } 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
2287 // 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
2288 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
2289 */
a5004eb92a79 fix sub_select fiasco with global sub numbering. now multiple sub sources can be managed in essentially one list.
joey
parents: 13500
diff changeset
2290 } 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
2291 // 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
2292 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
2293 }
a5004eb92a79 fix sub_select fiasco with global sub numbering. now multiple sub sources can be managed in essentially one list.
joey
parents: 13500
diff changeset
2294 // 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
2295 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
2296 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
2297 }
a5004eb92a79 fix sub_select fiasco with global sub numbering. now multiple sub sources can be managed in essentially one list.
joey
parents: 13500
diff changeset
2298
303
828ec81e0d64 codecs.conf support
arpi_esp
parents: 296
diff changeset
2299 //================== 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
2300 if(sh_audio){
303
828ec81e0d64 codecs.conf support
arpi_esp
parents: 296
diff changeset
2301 // 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
2302 current_module="init_audio_codec";
7202
b414c2e34b2e removed buggy fd<0 check for disallowing dumpstream/cache
arpi
parents: 7201
diff changeset
2303 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
2304 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
2305 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
2306 } else
7caeb275ad26 uninit cleanup again... thx to Nilmoni Deb for bugreport
arpi
parents: 7614
diff changeset
2307 inited_flags|=INITED_ACODEC;
7502
6a2b6f3d619c best audio/video codec selection & init moved to libmpcodecs
arpi
parents: 7495
diff changeset
2308 mp_msg(MSGT_CPLAYER,MSGL_INFO,"==========================================================================\n");
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2309 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2310
7864
dacc35bc92c7 add -identify switch
ranma
parents: 7854
diff changeset
2311 if(identify) {
dacc35bc92c7 add -identify switch
ranma
parents: 7854
diff changeset
2312 mp_msg(MSGT_GLOBAL,MSGL_INFO,"ID_FILENAME=%s\n", filename);
16315
175eb8754ff3 adds 'ID_DEMUXER=avi' to -identify...
ods15
parents: 16290
diff changeset
2313 mp_msg(MSGT_GLOBAL,MSGL_INFO,"ID_DEMUXER=%s\n", demuxer->desc->name);
7864
dacc35bc92c7 add -identify switch
ranma
parents: 7854
diff changeset
2314 if (sh_video) {
dacc35bc92c7 add -identify switch
ranma
parents: 7854
diff changeset
2315 /* Assume FOURCC if all bytes >= 0x20 (' ') */
dacc35bc92c7 add -identify switch
ranma
parents: 7854
diff changeset
2316 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
2317 mp_msg(MSGT_GLOBAL,MSGL_INFO,"ID_VIDEO_FORMAT=%.4s\n", &sh_video->format);
7864
dacc35bc92c7 add -identify switch
ranma
parents: 7854
diff changeset
2318 else
8672
9065fd98fad3 I've made some changes to the -identify handling. As previously the output
arpi
parents: 8644
diff changeset
2319 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
2320 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
2321 mp_msg(MSGT_GLOBAL,MSGL_INFO,"ID_VIDEO_WIDTH=%d\n", sh_video->disp_w);
dacc35bc92c7 add -identify switch
ranma
parents: 7854
diff changeset
2322 mp_msg(MSGT_GLOBAL,MSGL_INFO,"ID_VIDEO_HEIGHT=%d\n", sh_video->disp_h);
dacc35bc92c7 add -identify switch
ranma
parents: 7854
diff changeset
2323 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
2324 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
2325 }
dacc35bc92c7 add -identify switch
ranma
parents: 7854
diff changeset
2326 if (sh_audio) {
dacc35bc92c7 add -identify switch
ranma
parents: 7854
diff changeset
2327 if (sh_audio->codec)
dacc35bc92c7 add -identify switch
ranma
parents: 7854
diff changeset
2328 mp_msg(MSGT_GLOBAL,MSGL_INFO, "ID_AUDIO_CODEC=%s\n", sh_audio->codec->name);
dacc35bc92c7 add -identify switch
ranma
parents: 7854
diff changeset
2329 /* Assume FOURCC if all bytes >= 0x20 (' ') */
dacc35bc92c7 add -identify switch
ranma
parents: 7854
diff changeset
2330 if (sh_audio->format >= 0x20202020)
dacc35bc92c7 add -identify switch
ranma
parents: 7854
diff changeset
2331 mp_msg(MSGT_GLOBAL,MSGL_INFO, "ID_AUDIO_FORMAT=%.4s\n", &sh_audio->format);
dacc35bc92c7 add -identify switch
ranma
parents: 7854
diff changeset
2332 else
dacc35bc92c7 add -identify switch
ranma
parents: 7854
diff changeset
2333 mp_msg(MSGT_GLOBAL,MSGL_INFO,"ID_AUDIO_FORMAT=%d\n", sh_audio->format);
dacc35bc92c7 add -identify switch
ranma
parents: 7854
diff changeset
2334 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
2335 mp_msg(MSGT_GLOBAL,MSGL_INFO,"ID_AUDIO_RATE=%d\n", sh_audio->samplerate);
dacc35bc92c7 add -identify switch
ranma
parents: 7854
diff changeset
2336 mp_msg(MSGT_GLOBAL,MSGL_INFO,"ID_AUDIO_NCH=%d\n", sh_audio->channels);
dacc35bc92c7 add -identify switch
ranma
parents: 7854
diff changeset
2337 }
16346
6ff303d2876b Make -identify's 'ID_LENGTH=' print a float and not an integer.. The
ods15
parents: 16345
diff changeset
2338 mp_msg(MSGT_GLOBAL,MSGL_INFO,"ID_LENGTH=%.2lf\n", demuxer_get_time_length(demuxer));
7864
dacc35bc92c7 add -identify switch
ranma
parents: 7854
diff changeset
2339 }
dacc35bc92c7 add -identify switch
ranma
parents: 7854
diff changeset
2340
7502
6a2b6f3d619c best audio/video codec selection & init moved to libmpcodecs
arpi
parents: 7495
diff changeset
2341 if(!sh_video) goto main; // audio-only
175
d43c7e6412f0 added DirectShow support
arpi_esp
parents: 162
diff changeset
2342
303
828ec81e0d64 codecs.conf support
arpi_esp
parents: 296
diff changeset
2343 //================== Init VIDEO (codec & libvo) ==========================
7677
33562a65e9e8 _EXPERIMENTAL_ option: -fixed-vo for libvo spec compliance testing
arpi
parents: 7628
diff changeset
2344 if(!fixed_vo || !(inited_flags&INITED_VO)){
5154
f67115a72b7c init/uninit libvo/ao/getch2/cache2 order fixed
arpi
parents: 5151
diff changeset
2345 current_module="preinit_libvo";
f67115a72b7c init/uninit libvo/ao/getch2/cache2 order fixed
arpi
parents: 5151
diff changeset
2346
5511
7a24a067f0af vo_config_count now counts calls to vo->config()
arpi
parents: 5507
diff changeset
2347 vo_config_count=0;
7562
92188b57a062 video out driver list support (like -vc, example: -vo xmga,xv,x11,)
arpi
parents: 7559
diff changeset
2348 //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
2349 if(!(video_out=init_best_video_out(video_driver_list))){
6930
cae1dd6343e7 moved messages to help_mp-??.h
jaf
parents: 6921
diff changeset
2350 mp_msg(MSGT_CPLAYER,MSGL_FATAL,MSGTR_ErrorInitializingVODevice);
5154
f67115a72b7c init/uninit libvo/ao/getch2/cache2 order fixed
arpi
parents: 5151
diff changeset
2351 goto goto_next_file; // exit_player(MSGTR_Exit_error);
f67115a72b7c init/uninit libvo/ao/getch2/cache2 order fixed
arpi
parents: 5151
diff changeset
2352 }
5075
37e15b16e38d libvo init moved to libmpcodecs
arpi
parents: 5072
diff changeset
2353 sh_video->video_out=video_out;
5154
f67115a72b7c init/uninit libvo/ao/getch2/cache2 order fixed
arpi
parents: 5151
diff changeset
2354 inited_flags|=INITED_VO;
7677
33562a65e9e8 _EXPERIMENTAL_ option: -fixed-vo for libvo spec compliance testing
arpi
parents: 7628
diff changeset
2355 }
5154
f67115a72b7c init/uninit libvo/ao/getch2/cache2 order fixed
arpi
parents: 5151
diff changeset
2356
5507
d0d029fda134 video filter layer - written from scratch, but inspired a lot by Fredrik Kuivinen's patch
arpi
parents: 5489
diff changeset
2357 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
2358 {
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9563
diff changeset
2359 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
2360 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
2361 }
8198
1935017c0f71 Experimantal OSD menu
albeu
parents: 8164
diff changeset
2362 #ifdef HAVE_MENU
1935017c0f71 Experimantal OSD menu
albeu
parents: 8164
diff changeset
2363 if(use_menu) {
9593
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9563
diff changeset
2364 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
2365 vf_menu = vf_open_plugin(libmenu_vfs,sh_video->vfilter,"menu",vf_arg);
8198
1935017c0f71 Experimantal OSD menu
albeu
parents: 8164
diff changeset
2366 if(!vf_menu) {
13577
606d90e03a2f printf --> mp_msg conversion
diego
parents: 13502
diff changeset
2367 mp_msg(MSGT_CPLAYER,MSGL_ERR,MSGTR_CantOpenLibmenuFilterWithThisRootMenu,menu_root);
8198
1935017c0f71 Experimantal OSD menu
albeu
parents: 8164
diff changeset
2368 use_menu = 0;
1935017c0f71 Experimantal OSD menu
albeu
parents: 8164
diff changeset
2369 }
1935017c0f71 Experimantal OSD menu
albeu
parents: 8164
diff changeset
2370 }
1935017c0f71 Experimantal OSD menu
albeu
parents: 8164
diff changeset
2371 if(vf_menu)
1935017c0f71 Experimantal OSD menu
albeu
parents: 8164
diff changeset
2372 sh_video->vfilter=(void*)append_filters(vf_menu);
1935017c0f71 Experimantal OSD menu
albeu
parents: 8164
diff changeset
2373 else
1935017c0f71 Experimantal OSD menu
albeu
parents: 8164
diff changeset
2374 #endif
7559
b645204ea527 some cleanup - made private vars/funcs static, removed obsolete externs
arpi
parents: 7529
diff changeset
2375 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
2376
5154
f67115a72b7c init/uninit libvo/ao/getch2/cache2 order fixed
arpi
parents: 5151
diff changeset
2377 current_module="init_video_codec";
303
828ec81e0d64 codecs.conf support
arpi_esp
parents: 296
diff changeset
2378
5175
8354d89498d4 video codec selection redesigned and moved to libmpcodecs - now it's 'intelligent'
arpi
parents: 5154
diff changeset
2379 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
2380 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
2381 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
2382
8354d89498d4 video codec selection redesigned and moved to libmpcodecs - now it's 'intelligent'
arpi
parents: 5154
diff changeset
2383 if(!sh_video->inited){
7677
33562a65e9e8 _EXPERIMENTAL_ option: -fixed-vo for libvo spec compliance testing
arpi
parents: 7628
diff changeset
2384 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
2385 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
2386 sh_video = d_video->sh = NULL;
8354d89498d4 video codec selection redesigned and moved to libmpcodecs - now it's 'intelligent'
arpi
parents: 5154
diff changeset
2387 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
2388 }
8354d89498d4 video codec selection redesigned and moved to libmpcodecs - now it's 'intelligent'
arpi
parents: 5154
diff changeset
2389
7621
7caeb275ad26 uninit cleanup again... thx to Nilmoni Deb for bugreport
arpi
parents: 7614
diff changeset
2390 inited_flags|=INITED_VCODEC;
7caeb275ad26 uninit cleanup again... thx to Nilmoni Deb for bugreport
arpi
parents: 7614
diff changeset
2391
16522
49ef03cb382a Prints -identify output for:
gpoirier
parents: 16490
diff changeset
2392 if (identify && sh_video->codec)
49ef03cb382a Prints -identify output for:
gpoirier
parents: 16490
diff changeset
2393 mp_msg(MSGT_GLOBAL, MSGL_INFO, "ID_VIDEO_CODEC=%s\n", sh_video->codec->name);
49ef03cb382a Prints -identify output for:
gpoirier
parents: 16490
diff changeset
2394
1439
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
2395 if(auto_quality>0){
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
2396 // Auto quality option enabled
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
2397 output_quality=get_video_quality_max(sh_video);
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
2398 if(auto_quality>output_quality) auto_quality=output_quality;
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
2399 else output_quality=auto_quality;
13577
606d90e03a2f printf --> mp_msg conversion
diego
parents: 13502
diff changeset
2400 mp_msg(MSGT_CPLAYER,MSGL_V,"AutoQ: setting quality to %d.\n",output_quality);
1439
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
2401 set_video_quality(sh_video,output_quality);
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
2402 }
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
2403
398
f5918fc8df10 more cleanup of video decoding
arpi_esp
parents: 396
diff changeset
2404 // ========== Init display (sh_video->disp_w*sh_video->disp_h/out_fmt) ============
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2405
6781
924263b4df10 eq reworked
alex
parents: 6755
diff changeset
2406 current_module="init_vo";
6755
a31b9f15cbff - fix audio equalizer
pontscho
parents: 6713
diff changeset
2407
6110
7bea806b9c5f Improvment for spu subtitles.
albeu
parents: 6082
diff changeset
2408 if(vo_flags & 0x08 && vo_spudec)
7bea806b9c5f Improvment for spu subtitles.
albeu
parents: 6082
diff changeset
2409 spudec_set_hw_spu(vo_spudec,video_out);
7bea806b9c5f Improvment for spu subtitles.
albeu
parents: 6082
diff changeset
2410
7122
0dc9cb756b68 freetype 2.0/2.1+ support - disabled by default until bugs fixed
arpi
parents: 7111
diff changeset
2411 #ifdef HAVE_FREETYPE
0dc9cb756b68 freetype 2.0/2.1+ support - disabled by default until bugs fixed
arpi
parents: 7111
diff changeset
2412 force_load_font = 1;
0dc9cb756b68 freetype 2.0/2.1+ support - disabled by default until bugs fixed
arpi
parents: 7111
diff changeset
2413 #endif
0dc9cb756b68 freetype 2.0/2.1+ support - disabled by default until bugs fixed
arpi
parents: 7111
diff changeset
2414
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2415 //================== MAIN: ==========================
7502
6a2b6f3d619c best audio/video codec selection & init moved to libmpcodecs
arpi
parents: 7495
diff changeset
2416 main:
6a2b6f3d619c best audio/video codec selection & init moved to libmpcodecs
arpi
parents: 7495
diff changeset
2417 current_module="main";
6a2b6f3d619c best audio/video codec selection & init moved to libmpcodecs
arpi
parents: 7495
diff changeset
2418
16992
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
2419 // Disable the term osd in verbose mode
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
2420 if(verbose) term_osd = 0;
5154
f67115a72b7c init/uninit libvo/ao/getch2/cache2 order fixed
arpi
parents: 5151
diff changeset
2421 fflush(stdout);
5151
610d399f50c3 - cleanup pass 1. more to come soon...
arpi
parents: 5138
diff changeset
2422
5789
0132c5747e8a fix audio only files play
pontscho
parents: 5698
diff changeset
2423 #ifdef HAVE_NEW_GUI
0132c5747e8a fix audio only files play
pontscho
parents: 5698
diff changeset
2424 if ( use_gui )
0132c5747e8a fix audio only files play
pontscho
parents: 5698
diff changeset
2425 {
0132c5747e8a fix audio only files play
pontscho
parents: 5698
diff changeset
2426 if ( sh_audio ) guiIntfStruct.AudioType=sh_audio->channels; else guiIntfStruct.AudioType=0;
6796
9c828335b2d0 add preferences to gui
pontscho
parents: 6792
diff changeset
2427 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
2428 guiGetEvent( guiSetFileFormat,(char *)demuxer->file_format );
98bed9e12087 - add dxr3 gui support (dialogbox, etc.)
pontscho
parents: 6971
diff changeset
2429 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
2430 guiGetEvent( guiSetDemuxer,(char *)demuxer );
5789
0132c5747e8a fix audio only files play
pontscho
parents: 5698
diff changeset
2431 }
0132c5747e8a fix audio only files play
pontscho
parents: 5698
diff changeset
2432 #endif
0132c5747e8a fix audio only files play
pontscho
parents: 5698
diff changeset
2433
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2434 {
1420
d97816161256 removed obsolote frame_corr_* stuff
arpi
parents: 1410
diff changeset
2435 //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
2436 //float v_frame=0; // Video
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2437 float time_frame=0; // Timer
1400
2bf9c561b01d stage2 step 1
arpi
parents: 1382
diff changeset
2438 //float num_frames=0; // number of frames played
1382
9e8781a3eefc grab.mpg fixed
arpi
parents: 1375
diff changeset
2439 int grab_frames=0;
212
7034ef1f685d new option: -font
arpi_esp
parents: 208
diff changeset
2440 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
2441 char osd_show_text_buffer[64];
5612
027568c0f982 new -framedrop code - works much better than the old one
arpi
parents: 5610
diff changeset
2442 int drop_frame=0; // current dropping status
027568c0f982 new -framedrop code - works much better than the old one
arpi
parents: 5610
diff changeset
2443 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
2444 int too_slow_frame_cnt=0;
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
2445 int too_fast_frame_cnt=0;
1439
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
2446 // 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
2447 float AV_delay=0; // average of A-V timestamp differences
1439
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
2448 double vdecode_time;
6028
bd016664dc18 UMRs fixed - noticed by Nilmoni Deb <ndeb@ece.cmu.edu>
arpi
parents: 6016
diff changeset
2449 unsigned int lastframeout_ts=0;
8254
772d6d27fd66 warning patch by (Dominik Mierzejewski <dominik at rangers dot eu dot org>)
michael
parents: 8208
diff changeset
2450 /*float time_frame_corr_avg=0;*/ /* unused */
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2451
5929
9e7d54e7be58 - frame_time delayed one frame, as it's really duration of current frame,
arpi
parents: 5927
diff changeset
2452 float next_frame_time=0;
9e7d54e7be58 - frame_time delayed one frame, as it's really duration of current frame,
arpi
parents: 5927
diff changeset
2453 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
2454 int blit_frame=0;
9e7d54e7be58 - frame_time delayed one frame, as it's really duration of current frame,
arpi
parents: 5927
diff changeset
2455
6028
bd016664dc18 UMRs fixed - noticed by Nilmoni Deb <ndeb@ece.cmu.edu>
arpi
parents: 6016
diff changeset
2456 osd_text_buffer[0]=0;
16402
75532be41c6d clear OSD when playing new file
reimar
parents: 16360
diff changeset
2457 // make sure OSD old does not stay around,
75532be41c6d clear OSD when playing new file
reimar
parents: 16360
diff changeset
2458 // e.g. with -fixed-vo and same-resolution files
75532be41c6d clear OSD when playing new file
reimar
parents: 16360
diff changeset
2459 vo_osd_text = osd_text_buffer;
75532be41c6d clear OSD when playing new file
reimar
parents: 16360
diff changeset
2460 vo_osd_changed(OSDTYPE_OSD);
6028
bd016664dc18 UMRs fixed - noticed by Nilmoni Deb <ndeb@ece.cmu.edu>
arpi
parents: 6016
diff changeset
2461
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2462 //================ SETUP AUDIO ==========================
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2463
1369
7a2f1881b776 a_frame, v_frame killed, using sh_audio/video->timer. has_audio not more used after initialization.
arpi
parents: 1353
diff changeset
2464 if(sh_audio){
7563
e9e4398029de audio out driver list support (example: -ao alsa9,sdl:esd,oss,sdl:oss,)
arpi
parents: 7562
diff changeset
2465 //const ao_info_t *info=audio_out->info;
8995
865cbed58cf8 2-pass libaf initialization to get better filter chain.
arpi
parents: 8966
diff changeset
2466 current_module="af_preinit";
15811
9b4bbb6098f6 make -srate work again, unify audio filter init and preinit.
reimar
parents: 15789
diff changeset
2467 ao_data.samplerate=force_srate;
9b4bbb6098f6 make -srate work again, unify audio filter init and preinit.
reimar
parents: 15789
diff changeset
2468 ao_data.channels=0;
9b4bbb6098f6 make -srate work again, unify audio filter init and preinit.
reimar
parents: 15789
diff changeset
2469 ao_data.format=audio_output_format;
8995
865cbed58cf8 2-pass libaf initialization to get better filter chain.
arpi
parents: 8966
diff changeset
2470 #if 1
15811
9b4bbb6098f6 make -srate work again, unify audio filter init and preinit.
reimar
parents: 15789
diff changeset
2471 // first init to detect best values
8995
865cbed58cf8 2-pass libaf initialization to get better filter chain.
arpi
parents: 8966
diff changeset
2472 if(!preinit_audio_filters(sh_audio,
865cbed58cf8 2-pass libaf initialization to get better filter chain.
arpi
parents: 8966
diff changeset
2473 // input:
865cbed58cf8 2-pass libaf initialization to get better filter chain.
arpi
parents: 8966
diff changeset
2474 (int)(sh_audio->samplerate*playback_speed),
14818
663c1ea5f595 finally remove the refences to bps outside libaf. also simplification of some messages and removed redundants
alex
parents: 14807
diff changeset
2475 sh_audio->channels, sh_audio->sample_format,
8995
865cbed58cf8 2-pass libaf initialization to get better filter chain.
arpi
parents: 8966
diff changeset
2476 // output:
14818
663c1ea5f595 finally remove the refences to bps outside libaf. also simplification of some messages and removed redundants
alex
parents: 14807
diff changeset
2477 &ao_data.samplerate, &ao_data.channels, &ao_data.format)){
13577
606d90e03a2f printf --> mp_msg conversion
diego
parents: 13502
diff changeset
2478 mp_msg(MSGT_CPLAYER,MSGL_ERR,MSGTR_AudioFilterChainPreinitError);
16758
dbe5207f8c92 exit mplayer if audio filter init fails (same as mencoder does)
ivo
parents: 16742
diff changeset
2479 exit_player(MSGTR_Exit_error);
8995
865cbed58cf8 2-pass libaf initialization to get better filter chain.
arpi
parents: 8966
diff changeset
2480 }
865cbed58cf8 2-pass libaf initialization to get better filter chain.
arpi
parents: 8966
diff changeset
2481 #endif
7563
e9e4398029de audio out driver list support (example: -ao alsa9,sdl:esd,oss,sdl:oss,)
arpi
parents: 7562
diff changeset
2482 current_module="ao2_init";
e9e4398029de audio out driver list support (example: -ao alsa9,sdl:esd,oss,sdl:oss,)
arpi
parents: 7562
diff changeset
2483 if(!(audio_out=init_best_audio_out(audio_driver_list,
14254
21e72b6d8d11 Do not use audio plugins anymore
reimar
parents: 14245
diff changeset
2484 0, // plugin flag
15241
690f76d3bfc0 Apply -srate and -channels only to the start of the filter chain, not
reimar
parents: 15161
diff changeset
2485 ao_data.samplerate,
690f76d3bfc0 Apply -srate and -channels only to the start of the filter chain, not
reimar
parents: 15161
diff changeset
2486 ao_data.channels,
690f76d3bfc0 Apply -srate and -channels only to the start of the filter chain, not
reimar
parents: 15161
diff changeset
2487 ao_data.format,0))){
7563
e9e4398029de audio out driver list support (example: -ao alsa9,sdl:esd,oss,sdl:oss,)
arpi
parents: 7562
diff changeset
2488 // FAILED:
e9e4398029de audio out driver list support (example: -ao alsa9,sdl:esd,oss,sdl:oss,)
arpi
parents: 7562
diff changeset
2489 mp_msg(MSGT_CPLAYER,MSGL_ERR,MSGTR_CannotInitAO);
7621
7caeb275ad26 uninit cleanup again... thx to Nilmoni Deb for bugreport
arpi
parents: 7614
diff changeset
2490 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
2491 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
2492 } else {
e9e4398029de audio out driver list support (example: -ao alsa9,sdl:esd,oss,sdl:oss,)
arpi
parents: 7562
diff changeset
2493 // SUCCESS:
e9e4398029de audio out driver list support (example: -ao alsa9,sdl:esd,oss,sdl:oss,)
arpi
parents: 7562
diff changeset
2494 inited_flags|=INITED_AO;
16788
ec5244aea184 new message was even worse -- B/s means bytes per second, not sample!
rfelker
parents: 16781
diff changeset
2495 mp_msg(MSGT_CPLAYER,MSGL_INFO,"AO: [%s] %dHz %dch %s (%d bytes per sample)\n",
7563
e9e4398029de audio out driver list support (example: -ao alsa9,sdl:esd,oss,sdl:oss,)
arpi
parents: 7562
diff changeset
2496 audio_out->info->short_name,
8995
865cbed58cf8 2-pass libaf initialization to get better filter chain.
arpi
parents: 8966
diff changeset
2497 ao_data.samplerate, ao_data.channels,
14818
663c1ea5f595 finally remove the refences to bps outside libaf. also simplification of some messages and removed redundants
alex
parents: 14807
diff changeset
2498 af_fmt2str_short(ao_data.format),
14245
815f03b7cee5 removing AFMT_ dependancy
alex
parents: 14241
diff changeset
2499 af_fmt2bits(ao_data.format)/8 );
13577
606d90e03a2f printf --> mp_msg conversion
diego
parents: 13502
diff changeset
2500 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
2501 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
2502 if(strlen(audio_out->info->comment) > 0)
13577
606d90e03a2f printf --> mp_msg conversion
diego
parents: 13502
diff changeset
2503 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
2504 // init audio filters:
32efb806436e aufio filter layer (libaf) integration to libmpcodecs, mplayer and mencoder
arpi
parents: 7582
diff changeset
2505 #if 1
32efb806436e aufio filter layer (libaf) integration to libmpcodecs, mplayer and mencoder
arpi
parents: 7582
diff changeset
2506 current_module="af_init";
13710
d7af73cc38da allow changing playback speed during playback.
reimar
parents: 13684
diff changeset
2507 if(!build_afilter_chain(sh_audio, &ao_data)) {
13577
606d90e03a2f printf --> mp_msg conversion
diego
parents: 13502
diff changeset
2508 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
2509 // 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
2510 // uninit_player(INITED_ACODEC|INITED_AO); // close codec & ao
417a20a4fc75 don't -nosound if libaf init failed (hwac3 fix)
arpi
parents: 9006
diff changeset
2511 // sh_audio=d_audio->sh=NULL; // -> nosound
7604
32efb806436e aufio filter layer (libaf) integration to libmpcodecs, mplayer and mencoder
arpi
parents: 7582
diff changeset
2512 }
32efb806436e aufio filter layer (libaf) integration to libmpcodecs, mplayer and mencoder
arpi
parents: 7582
diff changeset
2513 #endif
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2514 }
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
2515 mixer.audio_out = audio_out;
13098
907fe1fdfc6c Make the stepsize of volume changes, changeable by a commandline paarameter
attila
parents: 13094
diff changeset
2516 mixer.volstep = volstep;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2517 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2518
5151
610d399f50c3 - cleanup pass 1. more to come soon...
arpi
parents: 5138
diff changeset
2519 current_module="av_init";
610d399f50c3 - cleanup pass 1. more to come soon...
arpi
parents: 5138
diff changeset
2520
610d399f50c3 - cleanup pass 1. more to come soon...
arpi
parents: 5138
diff changeset
2521 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
2522 if(sh_audio) sh_audio->delay=-audio_delay;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2523
1369
7a2f1881b776 a_frame, v_frame killed, using sh_audio/video->timer. has_audio not more used after initialization.
arpi
parents: 1353
diff changeset
2524 if(!sh_audio){
1973
5216f108cb4f all error/warn/info messages moved to help_mp-en.h for translation
arpi
parents: 1962
diff changeset
2525 mp_msg(MSGT_CPLAYER,MSGL_INFO,MSGTR_NoSound);
13684
af465f23bd1d 10l, patch by Jan Knutar <jknutar@nic.fi>
faust3
parents: 13626
diff changeset
2526 mp_msg(MSGT_CPLAYER,MSGL_V,"Freeing %d unused audio chunks.\n",d_audio->packs);
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2527 ds_free_packs(d_audio); // free buffered chunks
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2528 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
2529 //uninit_player(INITED_AO); // close device
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2530 }
5151
610d399f50c3 - cleanup pass 1. more to come soon...
arpi
parents: 5138
diff changeset
2531 if(!sh_video){
6930
cae1dd6343e7 moved messages to help_mp-??.h
jaf
parents: 6921
diff changeset
2532 mp_msg(MSGT_CPLAYER,MSGL_INFO,MSGTR_Video_NoVideo);
13684
af465f23bd1d 10l, patch by Jan Knutar <jknutar@nic.fi>
faust3
parents: 13626
diff changeset
2533 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
2534 ds_free_packs(d_video);
886bf5274992 Audio only support. Include a fix in the asf demuxer opening.
albeu
parents: 4552
diff changeset
2535 d_video->id=-2;
7677
33562a65e9e8 _EXPERIMENTAL_ option: -fixed-vo for libvo spec compliance testing
arpi
parents: 7628
diff changeset
2536 //if(!fixed_vo) uninit_player(INITED_VO);
5151
610d399f50c3 - cleanup pass 1. more to come soon...
arpi
parents: 5138
diff changeset
2537 }
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2538
6185
7e769ea2acc7 jump to next file (or exit) if can't decode audio && video
alex
parents: 6183
diff changeset
2539 if (!sh_video && !sh_audio)
7e769ea2acc7 jump to next file (or exit) if can't decode audio && video
alex
parents: 6183
diff changeset
2540 goto goto_next_file;
7e769ea2acc7 jump to next file (or exit) if can't decode audio && video
alex
parents: 6183
diff changeset
2541
8030
2b39ff3860b7 cleanup of .AVI timestamp calculation (ugly hack from mplayer.c removed,
arpi
parents: 8027
diff changeset
2542 //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
2543 if(force_fps && sh_video){
4598
badb76094897 setting vo_fps, required for vo_yuv4mpeg
arpi
parents: 4593
diff changeset
2544 vo_fps = sh_video->fps=force_fps;
398
f5918fc8df10 more cleanup of video decoding
arpi_esp
parents: 396
diff changeset
2545 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
2546 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
2547 }
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2548
1639
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
2549 //==================== START PLAYING =======================
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
2550
9105
9b387eae87e6 Secondly, fixed bug where -loop after file would play one too many times.
arpi
parents: 9090
diff changeset
2551 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
2552 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
2553
1582
12aa68bf2ff5 erros emssages moved to help_mp.h for translation
arpi
parents: 1567
diff changeset
2554 mp_msg(MSGT_CPLAYER,MSGL_INFO,MSGTR_StartPlaying);fflush(stdout);
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2555
5489
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
2556 #ifdef USE_DVDNAV
9752
3db72324a0fe Stream cleanup, don't use blah_on options anymore.
albeu
parents: 9695
diff changeset
2557 if (stream->type==STREAMTYPE_DVDNAV) {
5489
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
2558 dvdnav_stream_fullstart((dvdnav_priv_t *)stream->priv);
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
2559 }
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
2560 #endif
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
2561
1124
0e95f30ffd4c -frames and -benchmark options to make chl & gabucino happy
arpi_esp
parents: 1059
diff changeset
2562 total_time_usage_start=GetTimer();
3934
e8e7ca8995a1 codecs.conf parser hangup fixed by iive, cpu usage reset at start
arpi
parents: 3843
diff changeset
2563 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
2564 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
2565 play_n_frames=play_n_frames_mf;
bfc209bb3f48 -frames 0 fix, multifile frames support by tibcu
alex
parents: 6585
diff changeset
2566
bfc209bb3f48 -frames 0 fix, multifile frames support by tibcu
alex
parents: 6585
diff changeset
2567 if(play_n_frames==0){
bfc209bb3f48 -frames 0 fix, multifile frames support by tibcu
alex
parents: 6585
diff changeset
2568 eof=PT_NEXT_ENTRY; goto goto_next_file;
bfc209bb3f48 -frames 0 fix, multifile frames support by tibcu
alex
parents: 6585
diff changeset
2569 }
bfc209bb3f48 -frames 0 fix, multifile frames support by tibcu
alex
parents: 6585
diff changeset
2570
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2571 while(!eof){
1439
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
2572 float aq_sleep_time=0;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2573
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2574 /*========================== PLAY AUDIO ============================*/
5610
fd196de4f1e9 cleanup. cosmetics only, no functional changes
arpi
parents: 5607
diff changeset
2575
1369
7a2f1881b776 a_frame, v_frame killed, using sh_audio/video->timer. has_audio not more used after initialization.
arpi
parents: 1353
diff changeset
2576 while(sh_audio){
746
cd1f0d4de0b8 new audio playback and A-V sync code
arpi_esp
parents: 723
diff changeset
2577 unsigned int t;
4834
fdb92826250c max & average benchmarks
nick
parents: 4833
diff changeset
2578 double tt;
2705
013e84f44cf5 libvo driver may have its own timing
arpi
parents: 2647
diff changeset
2579 int playsize;
5610
fd196de4f1e9 cleanup. cosmetics only, no functional changes
arpi
parents: 5607
diff changeset
2580
fd196de4f1e9 cleanup. cosmetics only, no functional changes
arpi
parents: 5607
diff changeset
2581 current_module="play_audio";
2705
013e84f44cf5 libvo driver may have its own timing
arpi
parents: 2647
diff changeset
2582
8056
324b6e5387be A-V sync cleanup: sh_audio->timer replaced by sh_audio->delay, it contains
arpi
parents: 8030
diff changeset
2583 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
2584 playsize=audio_out->get_space();
746
cd1f0d4de0b8 new audio playback and A-V sync code
arpi_esp
parents: 723
diff changeset
2585
5610
fd196de4f1e9 cleanup. cosmetics only, no functional changes
arpi
parents: 5607
diff changeset
2586 // handle audio-only case:
13893
9f1c3cf149fe fix insane CPU usage with ao_null
reimar
parents: 13882
diff changeset
2587 if(playsize < ao_data.outburst &&
9f1c3cf149fe fix insane CPU usage with ao_null
reimar
parents: 13882
diff changeset
2588 !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
2589 usec_sleep(10000); // Wait a tick before retry
41d2da3bd082 Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents: 4818
diff changeset
2590 continue;
41d2da3bd082 Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents: 4818
diff changeset
2591 }
746
cd1f0d4de0b8 new audio playback and A-V sync code
arpi_esp
parents: 723
diff changeset
2592
cd1f0d4de0b8 new audio playback and A-V sync code
arpi_esp
parents: 723
diff changeset
2593 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
2594
fd196de4f1e9 cleanup. cosmetics only, no functional changes
arpi
parents: 5607
diff changeset
2595 // Fill buffer if needed:
1639
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
2596 current_module="decode_audio"; // Enter AUDIO decoder module
746
cd1f0d4de0b8 new audio playback and A-V sync code
arpi_esp
parents: 723
diff changeset
2597 t=GetTimer();
16290
8a2585bc494f ensure that audio-only files are decoded till the end by not only
reimar
parents: 16227
diff changeset
2598 while(sh_audio->a_out_buffer_len<playsize &&
8a2585bc494f ensure that audio-only files are decoded till the end by not only
reimar
parents: 16227
diff changeset
2599 (!d_audio->eof || sh_audio->a_in_buffer_len > 0)){
7604
32efb806436e aufio filter layer (libaf) integration to libmpcodecs, mplayer and mencoder
arpi
parents: 7582
diff changeset
2600 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
2601 playsize-sh_audio->a_out_buffer_len,sh_audio->a_out_buffer_size-sh_audio->a_out_buffer_len);
16290
8a2585bc494f ensure that audio-only files are decoded till the end by not only
reimar
parents: 16227
diff changeset
2602 if(ret<=0) { // EOF?
8a2585bc494f ensure that audio-only files are decoded till the end by not only
reimar
parents: 16227
diff changeset
2603 if (d_audio->eof)
8a2585bc494f ensure that audio-only files are decoded till the end by not only
reimar
parents: 16227
diff changeset
2604 sh_audio->a_in_buffer_len = 0; // make sure we don't hang if something's broken
8a2585bc494f ensure that audio-only files are decoded till the end by not only
reimar
parents: 16227
diff changeset
2605 break;
8a2585bc494f ensure that audio-only files are decoded till the end by not only
reimar
parents: 16227
diff changeset
2606 }
7604
32efb806436e aufio filter layer (libaf) integration to libmpcodecs, mplayer and mencoder
arpi
parents: 7582
diff changeset
2607 sh_audio->a_out_buffer_len+=ret;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2608 }
4834
fdb92826250c max & average benchmarks
nick
parents: 4833
diff changeset
2609 t=GetTimer()-t;
5610
fd196de4f1e9 cleanup. cosmetics only, no functional changes
arpi
parents: 5607
diff changeset
2610 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
2611 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
2612
fd196de4f1e9 cleanup. cosmetics only, no functional changes
arpi
parents: 5607
diff changeset
2613 // play audio:
fd196de4f1e9 cleanup. cosmetics only, no functional changes
arpi
parents: 5607
diff changeset
2614 current_module="play_audio";
7604
32efb806436e aufio filter layer (libaf) integration to libmpcodecs, mplayer and mencoder
arpi
parents: 7582
diff changeset
2615 playsize=audio_out->play(sh_audio->a_out_buffer,playsize,0);
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2616
955
3a3304cd9fd5 libao support
arpi_esp
parents: 940
diff changeset
2617 if(playsize>0){
7604
32efb806436e aufio filter layer (libaf) integration to libmpcodecs, mplayer and mencoder
arpi
parents: 7582
diff changeset
2618 sh_audio->a_out_buffer_len-=playsize;
32efb806436e aufio filter layer (libaf) integration to libmpcodecs, mplayer and mencoder
arpi
parents: 7582
diff changeset
2619 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
2620 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
2621 ao_data.bps : sh_audio->o_bps));
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2622 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2623
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2624 break;
5610
fd196de4f1e9 cleanup. cosmetics only, no functional changes
arpi
parents: 5607
diff changeset
2625 } // while(sh_audio)
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2626
4587
886bf5274992 Audio only support. Include a fix in the asf demuxer opening.
albeu
parents: 4552
diff changeset
2627 if(!sh_video) {
5610
fd196de4f1e9 cleanup. cosmetics only, no functional changes
arpi
parents: 5607
diff changeset
2628 // handle audio-only case:
10223
b89d03e939d6 display pts for audio-only files as hh:mm:ss.f
rfelker
parents: 10219
diff changeset
2629 if(!quiet) {
13857
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
2630 float a_pos = sh_audio->delay - audio_out->get_delay() * playback_speed;
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
2631 print_status(a_pos, 0, 0);
10223
b89d03e939d6 display pts for audio-only files as hh:mm:ss.f
rfelker
parents: 10219
diff changeset
2632 }
16290
8a2585bc494f ensure that audio-only files are decoded till the end by not only
reimar
parents: 16227
diff changeset
2633 if(d_audio->eof && sh_audio->a_in_buffer_len <= 0) eof = PT_NEXT_ENTRY;
5610
fd196de4f1e9 cleanup. cosmetics only, no functional changes
arpi
parents: 5607
diff changeset
2634
fd196de4f1e9 cleanup. cosmetics only, no functional changes
arpi
parents: 5607
diff changeset
2635 } else {
4587
886bf5274992 Audio only support. Include a fix in the asf demuxer opening.
albeu
parents: 4552
diff changeset
2636
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2637 /*========================== PLAY VIDEO ============================*/
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2638
5929
9e7d54e7be58 - frame_time delayed one frame, as it's really duration of current frame,
arpi
parents: 5927
diff changeset
2639 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
2640
9e7d54e7be58 - frame_time delayed one frame, as it's really duration of current frame,
arpi
parents: 5927
diff changeset
2641 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
2642 vo_fps=sh_video->fps;
9e7d54e7be58 - frame_time delayed one frame, as it's really duration of current frame,
arpi
parents: 5927
diff changeset
2643
9e7d54e7be58 - frame_time delayed one frame, as it's really duration of current frame,
arpi
parents: 5927
diff changeset
2644 if(!frame_time_remaining){
2567
ea6158be8103 video frame reading cleanup
arpi
parents: 2563
diff changeset
2645 //-------------------- Decode a frame: -----------------------
ea6158be8103 video frame reading cleanup
arpi
parents: 2563
diff changeset
2646 vdecode_time=video_time_usage;
5698
cb47abf3b511 Fix loop playback. Main loop was quited on end of video.
albeu
parents: 5681
diff changeset
2647 while(1)
2567
ea6158be8103 video frame reading cleanup
arpi
parents: 2563
diff changeset
2648 { unsigned char* start=NULL;
ea6158be8103 video frame reading cleanup
arpi
parents: 2563
diff changeset
2649 int in_size;
ea6158be8103 video frame reading cleanup
arpi
parents: 2563
diff changeset
2650 // get it!
ea6158be8103 video frame reading cleanup
arpi
parents: 2563
diff changeset
2651 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
2652 in_size=video_read_frame(sh_video,&next_frame_time,&start,force_fps);
2567
ea6158be8103 video frame reading cleanup
arpi
parents: 2563
diff changeset
2653 if(in_size<0){ eof=1; break; }
ea6158be8103 video frame reading cleanup
arpi
parents: 2563
diff changeset
2654 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
2655 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
2656 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
2657 time_frame+=frame_time; // for nosound
15584
b5f111039c16 keep vo_fps and vo_mouse_timer_const in sync with sh_video->fps, otherwise
reimar
parents: 15504
diff changeset
2658 // video_read_frame can change fps (e.g. for asf video)
b5f111039c16 keep vo_fps and vo_mouse_timer_const in sync with sh_video->fps, otherwise
reimar
parents: 15504
diff changeset
2659 vo_fps = sh_video->fps;
b5f111039c16 keep vo_fps and vo_mouse_timer_const in sync with sh_video->fps, otherwise
reimar
parents: 15504
diff changeset
2660 #ifdef HAVE_X11
b5f111039c16 keep vo_fps and vo_mouse_timer_const in sync with sh_video->fps, otherwise
reimar
parents: 15504
diff changeset
2661 vo_mouse_timer_const = (int)sh_video->fps;
b5f111039c16 keep vo_fps and vo_mouse_timer_const in sync with sh_video->fps, otherwise
reimar
parents: 15504
diff changeset
2662 #endif
5612
027568c0f982 new -framedrop code - works much better than the old one
arpi
parents: 5610
diff changeset
2663 // check for frame-drop:
5643
3d9de27d9bd0 OSD handled by vf control()
arpi
parents: 5640
diff changeset
2664 current_module="check_framedrop";
5612
027568c0f982 new -framedrop code - works much better than the old one
arpi
parents: 5610
diff changeset
2665 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
2666 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
2667 float d=delay-sh_audio->delay;
5612
027568c0f982 new -framedrop code - works much better than the old one
arpi
parents: 5610
diff changeset
2668 // 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
2669 // 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
2670 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
2671 drop_frame=frame_dropping;
027568c0f982 new -framedrop code - works much better than the old one
arpi
parents: 5610
diff changeset
2672 ++drop_frame_cnt;
027568c0f982 new -framedrop code - works much better than the old one
arpi
parents: 5610
diff changeset
2673 ++dropped_frames;
027568c0f982 new -framedrop code - works much better than the old one
arpi
parents: 5610
diff changeset
2674 } else {
027568c0f982 new -framedrop code - works much better than the old one
arpi
parents: 5610
diff changeset
2675 drop_frame=dropped_frames=0;
027568c0f982 new -framedrop code - works much better than the old one
arpi
parents: 5610
diff changeset
2676 }
5621
0426f9b887cd some more statistics: BENCHMARKn
arpi
parents: 5612
diff changeset
2677 ++total_frame_cnt;
5612
027568c0f982 new -framedrop code - works much better than the old one
arpi
parents: 5610
diff changeset
2678 }
2567
ea6158be8103 video frame reading cleanup
arpi
parents: 2563
diff changeset
2679 // decode:
ea6158be8103 video frame reading cleanup
arpi
parents: 2563
diff changeset
2680 current_module="decode_video";
ea6158be8103 video frame reading cleanup
arpi
parents: 2563
diff changeset
2681 // 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
2682 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
2683 break;
1291
36ed1692c0b8 video codec stuff moved to dec_video.c
arpi
parents: 1289
diff changeset
2684 }
2567
ea6158be8103 video frame reading cleanup
arpi
parents: 2563
diff changeset
2685 vdecode_time=video_time_usage-vdecode_time;
ea6158be8103 video frame reading cleanup
arpi
parents: 2563
diff changeset
2686 //------------------------ frame decoded. --------------------
5610
fd196de4f1e9 cleanup. cosmetics only, no functional changes
arpi
parents: 5607
diff changeset
2687
fd196de4f1e9 cleanup. cosmetics only, no functional changes
arpi
parents: 5607
diff changeset
2688 mp_dbg(MSGT_AVSYNC,MSGL_DBG2,"*** ftime=%5.3f ***\n",frame_time);
fd196de4f1e9 cleanup. cosmetics only, no functional changes
arpi
parents: 5607
diff changeset
2689
5927
cffef9cc01bb catching vo/vf init failure
arpi
parents: 5910
diff changeset
2690 if(sh_video->vf_inited<0){
6930
cae1dd6343e7 moved messages to help_mp-??.h
jaf
parents: 6921
diff changeset
2691 mp_msg(MSGT_CPLAYER,MSGL_FATAL,MSGTR_NotInitializeVOPorVO);
5927
cffef9cc01bb catching vo/vf init failure
arpi
parents: 5910
diff changeset
2692 eof=1; goto goto_next_file;
cffef9cc01bb catching vo/vf init failure
arpi
parents: 5910
diff changeset
2693 }
cffef9cc01bb catching vo/vf init failure
arpi
parents: 5910
diff changeset
2694
5929
9e7d54e7be58 - frame_time delayed one frame, as it's really duration of current frame,
arpi
parents: 5927
diff changeset
2695 }
9e7d54e7be58 - frame_time delayed one frame, as it's really duration of current frame,
arpi
parents: 5927
diff changeset
2696
5610
fd196de4f1e9 cleanup. cosmetics only, no functional changes
arpi
parents: 5607
diff changeset
2697 // ==========================================================================
2567
ea6158be8103 video frame reading cleanup
arpi
parents: 2563
diff changeset
2698
5643
3d9de27d9bd0 OSD handled by vf control()
arpi
parents: 5640
diff changeset
2699 // current_module="draw_osd";
3d9de27d9bd0 OSD handled by vf control()
arpi
parents: 5640
diff changeset
2700 // if(vo_config_count) video_out->draw_osd();
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2701
5610
fd196de4f1e9 cleanup. cosmetics only, no functional changes
arpi
parents: 5607
diff changeset
2702 #ifdef HAVE_NEW_GUI
fd196de4f1e9 cleanup. cosmetics only, no functional changes
arpi
parents: 5607
diff changeset
2703 if(use_gui) guiEventHandling();
fd196de4f1e9 cleanup. cosmetics only, no functional changes
arpi
parents: 5607
diff changeset
2704 #endif
fd196de4f1e9 cleanup. cosmetics only, no functional changes
arpi
parents: 5607
diff changeset
2705
fd196de4f1e9 cleanup. cosmetics only, no functional changes
arpi
parents: 5607
diff changeset
2706 current_module="calc_sleep_time";
780
24e4e6e5aa1c audio sync cleanup and -bps fixed
arpi_esp
parents: 778
diff changeset
2707
5612
027568c0f982 new -framedrop code - works much better than the old one
arpi
parents: 5610
diff changeset
2708 #if 0
027568c0f982 new -framedrop code - works much better than the old one
arpi
parents: 5610
diff changeset
2709 { // debug frame dropping code
3097
81ea8a5488cc small change in mplayer.c and cfg-mplayer.h
anders
parents: 3054
diff changeset
2710 float delay=audio_out->get_delay();
5612
027568c0f982 new -framedrop code - works much better than the old one
arpi
parents: 5610
diff changeset
2711 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
2712 sh_video->timer,sh_audio->timer-delay,
027568c0f982 new -framedrop code - works much better than the old one
arpi
parents: 5610
diff changeset
2713 sh_video->timer-(sh_audio->timer-delay),
027568c0f982 new -framedrop code - works much better than the old one
arpi
parents: 5610
diff changeset
2714 delay,drop_frame);
027568c0f982 new -framedrop code - works much better than the old one
arpi
parents: 5610
diff changeset
2715 }
027568c0f982 new -framedrop code - works much better than the old one
arpi
parents: 5610
diff changeset
2716 #endif
027568c0f982 new -framedrop code - works much better than the old one
arpi
parents: 5610
diff changeset
2717
7576
c135f7646036 new opt: -autosync, controls ao->get_delay() smoothing (default: disabled)
arpi
parents: 7563
diff changeset
2718 if(drop_frame && !frame_time_remaining && !autosync){
c135f7646036 new opt: -autosync, controls ao->get_delay() smoothing (default: disabled)
arpi
parents: 7563
diff changeset
2719 /*
c135f7646036 new opt: -autosync, controls ao->get_delay() smoothing (default: disabled)
arpi
parents: 7563
diff changeset
2720 * 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
2721 * 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
2722 * 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
2723 * < 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
2724 * 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
2725 * 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
2726 * 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
2727 */
5610
fd196de4f1e9 cleanup. cosmetics only, no functional changes
arpi
parents: 5607
diff changeset
2728
fd196de4f1e9 cleanup. cosmetics only, no functional changes
arpi
parents: 5607
diff changeset
2729 time_frame=0; // don't sleep!
fd196de4f1e9 cleanup. cosmetics only, no functional changes
arpi
parents: 5607
diff changeset
2730 blit_frame=0; // don't display!
fd196de4f1e9 cleanup. cosmetics only, no functional changes
arpi
parents: 5607
diff changeset
2731
798
cfb984ecb5fd frame dropping...
arpi_esp
parents: 795
diff changeset
2732 } else {
5612
027568c0f982 new -framedrop code - works much better than the old one
arpi
parents: 5610
diff changeset
2733
780
24e4e6e5aa1c audio sync cleanup and -bps fixed
arpi_esp
parents: 778
diff changeset
2734 // It's time to sleep...
5612
027568c0f982 new -framedrop code - works much better than the old one
arpi
parents: 5610
diff changeset
2735
5929
9e7d54e7be58 - frame_time delayed one frame, as it's really duration of current frame,
arpi
parents: 5927
diff changeset
2736 frame_time_remaining=0;
780
24e4e6e5aa1c audio sync cleanup and -bps fixed
arpi_esp
parents: 778
diff changeset
2737 time_frame-=GetRelativeTime(); // reset timer
24e4e6e5aa1c audio sync cleanup and -bps fixed
arpi_esp
parents: 778
diff changeset
2738
1369
7a2f1881b776 a_frame, v_frame killed, using sh_audio/video->timer. has_audio not more used after initialization.
arpi
parents: 1353
diff changeset
2739 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
2740 float delay=playback_speed*audio_out->get_delay();
3097
81ea8a5488cc small change in mplayer.c and cfg-mplayer.h
anders
parents: 3054
diff changeset
2741 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
2742
7576
c135f7646036 new opt: -autosync, controls ao->get_delay() smoothing (default: disabled)
arpi
parents: 7563
diff changeset
2743 if (autosync){
c135f7646036 new opt: -autosync, controls ao->get_delay() smoothing (default: disabled)
arpi
parents: 7563
diff changeset
2744 /*
c135f7646036 new opt: -autosync, controls ao->get_delay() smoothing (default: disabled)
arpi
parents: 7563
diff changeset
2745 * 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
2746 * 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
2747 * 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
2748 * 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
2749 * 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
2750 * 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
2751 * 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
2752 */
8056
324b6e5387be A-V sync cleanup: sh_audio->timer replaced by sh_audio->delay, it contains
arpi
parents: 8030
diff changeset
2753 float predicted = sh_audio->delay+time_frame;
7576
c135f7646036 new opt: -autosync, controls ao->get_delay() smoothing (default: disabled)
arpi
parents: 7563
diff changeset
2754 float difference = delay - predicted;
c135f7646036 new opt: -autosync, controls ao->get_delay() smoothing (default: disabled)
arpi
parents: 7563
diff changeset
2755 delay = predicted + difference / (float)autosync;
c135f7646036 new opt: -autosync, controls ao->get_delay() smoothing (default: disabled)
arpi
parents: 7563
diff changeset
2756 }
c135f7646036 new opt: -autosync, controls ao->get_delay() smoothing (default: disabled)
arpi
parents: 7563
diff changeset
2757
8056
324b6e5387be A-V sync cleanup: sh_audio->timer replaced by sh_audio->delay, it contains
arpi
parents: 8030
diff changeset
2758 time_frame=delay-sh_audio->delay;
3097
81ea8a5488cc small change in mplayer.c and cfg-mplayer.h
anders
parents: 3054
diff changeset
2759
7495
12b2c735ad07 removed -dapsync (obsolete code)
arpi
parents: 7494
diff changeset
2760 // 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
2761 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
2762 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
2763 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
2764 // 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
2765 frame_time_remaining=1;
9e7d54e7be58 - frame_time delayed one frame, as it's really duration of current frame,
arpi
parents: 5927
diff changeset
2766 time_frame=delay*0.5;
9e7d54e7be58 - frame_time delayed one frame, as it's really duration of current frame,
arpi
parents: 5927
diff changeset
2767 }
9e7d54e7be58 - frame_time delayed one frame, as it's really duration of current frame,
arpi
parents: 5927
diff changeset
2768
780
24e4e6e5aa1c audio sync cleanup and -bps fixed
arpi_esp
parents: 778
diff changeset
2769 } else {
5610
fd196de4f1e9 cleanup. cosmetics only, no functional changes
arpi
parents: 5607
diff changeset
2770
2889
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
2771 // NOSOUND:
1124
0e95f30ffd4c -frames and -benchmark options to make chl & gabucino happy
arpi_esp
parents: 1059
diff changeset
2772 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
2773 time_frame=0;
0e95f30ffd4c -frames and -benchmark options to make chl & gabucino happy
arpi_esp
parents: 1059
diff changeset
2774
780
24e4e6e5aa1c audio sync cleanup and -bps fixed
arpi_esp
parents: 778
diff changeset
2775 }
798
cfb984ecb5fd frame dropping...
arpi_esp
parents: 795
diff changeset
2776
1369
7a2f1881b776 a_frame, v_frame killed, using sh_audio/video->timer. has_audio not more used after initialization.
arpi
parents: 1353
diff changeset
2777 // 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
2778
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
2779 aq_sleep_time+=time_frame;
1709
a4e0211455d8 GUI integration, step 1
arpi
parents: 1694
diff changeset
2780
5610
fd196de4f1e9 cleanup. cosmetics only, no functional changes
arpi
parents: 5607
diff changeset
2781 } // !drop_frame
fd196de4f1e9 cleanup. cosmetics only, no functional changes
arpi
parents: 5607
diff changeset
2782
fd196de4f1e9 cleanup. cosmetics only, no functional changes
arpi
parents: 5607
diff changeset
2783 //============================== SLEEP: ===================================
fd196de4f1e9 cleanup. cosmetics only, no functional changes
arpi
parents: 5607
diff changeset
2784
8068
a9e2956905e6 scale sleep time too (-speed)
arpi
parents: 8056
diff changeset
2785 time_frame/=playback_speed;
a9e2956905e6 scale sleep time too (-speed)
arpi
parents: 8056
diff changeset
2786
5610
fd196de4f1e9 cleanup. cosmetics only, no functional changes
arpi
parents: 5607
diff changeset
2787 // flag 256 means: libvo driver does its timing (dvb card)
fd196de4f1e9 cleanup. cosmetics only, no functional changes
arpi
parents: 5607
diff changeset
2788 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
2789
3015
8bf21c807656 RTC is autodetected
arpi
parents: 2941
diff changeset
2790 #ifdef HAVE_RTC
2889
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
2791 if(rtc_fd>=0){
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
2792 // -------- RTC -----------
5610
fd196de4f1e9 cleanup. cosmetics only, no functional changes
arpi
parents: 5607
diff changeset
2793 current_module="sleep_rtc";
2889
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
2794 while (time_frame > 0.000) {
7494
229287c14cd4 RTC fixes by Sidik Isani <lksi@cfht.hawaii.edu>
arpi
parents: 7486
diff changeset
2795 unsigned long rtc_ts;
2889
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
2796 if (read (rtc_fd, &rtc_ts, sizeof(rtc_ts)) <= 0)
13577
606d90e03a2f printf --> mp_msg conversion
diego
parents: 13502
diff changeset
2797 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
2798 time_frame-=GetRelativeTime();
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
2799 }
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
2800 } else
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
2801 #endif
15288
7fc3a521d42b use darwin accurate timer
nplourde
parents: 15285
diff changeset
2802 #ifdef SYS_DARWIN
7fc3a521d42b use darwin accurate timer
nplourde
parents: 15285
diff changeset
2803 {
7fc3a521d42b use darwin accurate timer
nplourde
parents: 15285
diff changeset
2804 current_module="sleep_darwin";
7fc3a521d42b use darwin accurate timer
nplourde
parents: 15285
diff changeset
2805 while(time_frame>0.005) {
7fc3a521d42b use darwin accurate timer
nplourde
parents: 15285
diff changeset
2806 usec_sleep(1000000*time_frame);
7fc3a521d42b use darwin accurate timer
nplourde
parents: 15285
diff changeset
2807 time_frame-=GetRelativeTime();
7fc3a521d42b use darwin accurate timer
nplourde
parents: 15285
diff changeset
2808 }
7fc3a521d42b use darwin accurate timer
nplourde
parents: 15285
diff changeset
2809 }
7fc3a521d42b use darwin accurate timer
nplourde
parents: 15285
diff changeset
2810 #else
2889
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
2811 {
12954
f9755d9c479a Native darwin timer update.
wight
parents: 12893
diff changeset
2812 // -------- TIMER + SOFTSLEEP -----------
2889
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
2813 float min=softsleep?0.021:0.005;
12954
f9755d9c479a Native darwin timer update.
wight
parents: 12893
diff changeset
2814 current_module="sleep_timer";
2889
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
2815 while(time_frame>min){
746
cd1f0d4de0b8 new audio playback and A-V sync code
arpi_esp
parents: 723
diff changeset
2816 if(time_frame<=0.020)
1439
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
2817 usec_sleep(0); // sleeps 1 clock tick (10ms)!
746
cd1f0d4de0b8 new audio playback and A-V sync code
arpi_esp
parents: 723
diff changeset
2818 else
2757
b8b92c4afa22 fixed usleep() - 10l?
arpi
parents: 2705
diff changeset
2819 usec_sleep(1000000*(time_frame-0.020));
746
cd1f0d4de0b8 new audio playback and A-V sync code
arpi_esp
parents: 723
diff changeset
2820 time_frame-=GetRelativeTime();
2889
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
2821 }
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
2822 if(softsleep){
5610
fd196de4f1e9 cleanup. cosmetics only, no functional changes
arpi
parents: 5607
diff changeset
2823 current_module="sleep_soft";
13577
606d90e03a2f printf --> mp_msg conversion
diego
parents: 13502
diff changeset
2824 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
2825 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
2826 }
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
2827 }
16490
f17b3c152fd6 Add comments to a few #endif statements in order to make clear which
diego
parents: 16489
diff changeset
2828 #endif /* SYS_DARWIN */
2705
013e84f44cf5 libvo driver may have its own timing
arpi
parents: 2647
diff changeset
2829 }
117
b21b7c2fa180 common vo->flip_page() call
arpi_esp
parents: 112
diff changeset
2830
5929
9e7d54e7be58 - frame_time delayed one frame, as it's really duration of current frame,
arpi
parents: 5927
diff changeset
2831 //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
2832
5610
fd196de4f1e9 cleanup. cosmetics only, no functional changes
arpi
parents: 5607
diff changeset
2833 //====================== FLIP PAGE (VIDEO BLT): =========================
fd196de4f1e9 cleanup. cosmetics only, no functional changes
arpi
parents: 5607
diff changeset
2834
6123
d5606e4d0280 module name fixed for vo check_events
arpi
parents: 6112
diff changeset
2835 current_module="vo_check_events";
d5606e4d0280 module name fixed for vo check_events
arpi
parents: 6112
diff changeset
2836 if(vo_config_count) video_out->check_events();
d5606e4d0280 module name fixed for vo check_events
arpi
parents: 6112
diff changeset
2837
715
2bd7c16d89e1 frame dropping hack
arpi_esp
parents: 701
diff changeset
2838 current_module="flip_page";
8450
8cfc9309f0cc notice vo driver about skipped/dropped frames
arpi
parents: 8423
diff changeset
2839 if (!frame_time_remaining) {
8cfc9309f0cc notice vo driver about skipped/dropped frames
arpi
parents: 8423
diff changeset
2840 if(blit_frame){
1962
a0bd07b10667 fixed VO time usage (now including page-flip)
arpi
parents: 1953
diff changeset
2841 unsigned int t2=GetTimer();
4838
5129860a980e frame dropping prediction with benchmarks
nick
parents: 4835
diff changeset
2842 double tt;
2889
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
2843 float j;
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
2844 #define FRAME_LAG_WARN 0.2
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
2845 j = ((float)t2 - lastframeout_ts) / 1000000;
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
2846 lastframeout_ts = GetTimer();
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
2847 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
2848 too_fast_frame_cnt++;
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
2849 /* printf ("PANIC: too fast frame (%.3f)!\n", j); */
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
2850 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
2851 too_slow_frame_cnt++;
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
2852 /* printf ("PANIC: too slow frame (%.3f)!\n", j); */
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2880
diff changeset
2853
5511
7a24a067f0af vo_config_count now counts calls to vo->config()
arpi
parents: 5507
diff changeset
2854 if(vo_config_count) video_out->flip_page();
15895
7742302e793d Do not count skipped/broken frames when using -frames
reimar
parents: 15865
diff changeset
2855 if (play_n_frames >= 0) {
7742302e793d Do not count skipped/broken frames when using -frames
reimar
parents: 15865
diff changeset
2856 --play_n_frames;
16730
8ba196af5609 -frames plays one frame too many.
reimar
parents: 16654
diff changeset
2857 if (play_n_frames <= 0) eof = PT_NEXT_ENTRY;
15895
7742302e793d Do not count skipped/broken frames when using -frames
reimar
parents: 15865
diff changeset
2858 }
7742302e793d Do not count skipped/broken frames when using -frames
reimar
parents: 15865
diff changeset
2859
5610
fd196de4f1e9 cleanup. cosmetics only, no functional changes
arpi
parents: 5607
diff changeset
2860 // usec_sleep(50000); // test only!
4838
5129860a980e frame dropping prediction with benchmarks
nick
parents: 4835
diff changeset
2861 t2=GetTimer()-t2;
5129860a980e frame dropping prediction with benchmarks
nick
parents: 4835
diff changeset
2862 tt = t2*0.000001f;
5129860a980e frame dropping prediction with benchmarks
nick
parents: 4835
diff changeset
2863 vout_time_usage+=tt;
8450
8cfc9309f0cc notice vo driver about skipped/dropped frames
arpi
parents: 8423
diff changeset
2864 } else {
8cfc9309f0cc notice vo driver about skipped/dropped frames
arpi
parents: 8423
diff changeset
2865 /*
8cfc9309f0cc notice vo driver about skipped/dropped frames
arpi
parents: 8423
diff changeset
2866 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
2867 otherwise A/V desync will occur. -- Alvieboy
8cfc9309f0cc notice vo driver about skipped/dropped frames
arpi
parents: 8423
diff changeset
2868 */
8cfc9309f0cc notice vo driver about skipped/dropped frames
arpi
parents: 8423
diff changeset
2869 if (vo_config_count)
8cfc9309f0cc notice vo driver about skipped/dropped frames
arpi
parents: 8423
diff changeset
2870 video_out->control(VOCTRL_DUPLICATE_FRAME, NULL);
8cfc9309f0cc notice vo driver about skipped/dropped frames
arpi
parents: 8423
diff changeset
2871 }
8cfc9309f0cc notice vo driver about skipped/dropped frames
arpi
parents: 8423
diff changeset
2872 }
5610
fd196de4f1e9 cleanup. cosmetics only, no functional changes
arpi
parents: 5607
diff changeset
2873 //====================== A-V TIMESTAMP CORRECTION: =========================
fd196de4f1e9 cleanup. cosmetics only, no functional changes
arpi
parents: 5607
diff changeset
2874
fd196de4f1e9 cleanup. cosmetics only, no functional changes
arpi
parents: 5607
diff changeset
2875 current_module="av_sync";
fd196de4f1e9 cleanup. cosmetics only, no functional changes
arpi
parents: 5607
diff changeset
2876
1369
7a2f1881b776 a_frame, v_frame killed, using sh_audio/video->timer. has_audio not more used after initialization.
arpi
parents: 1353
diff changeset
2877 if(sh_audio){
780
24e4e6e5aa1c audio sync cleanup and -bps fixed
arpi_esp
parents: 778
diff changeset
2878 float a_pts=0;
24e4e6e5aa1c audio sync cleanup and -bps fixed
arpi_esp
parents: 778
diff changeset
2879 float v_pts=0;
24e4e6e5aa1c audio sync cleanup and -bps fixed
arpi_esp
parents: 778
diff changeset
2880
746
cd1f0d4de0b8 new audio playback and A-V sync code
arpi_esp
parents: 723
diff changeset
2881 // 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
2882 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
2883
7576
c135f7646036 new opt: -autosync, controls ao->get_delay() smoothing (default: disabled)
arpi
parents: 7563
diff changeset
2884 if (autosync){
c135f7646036 new opt: -autosync, controls ao->get_delay() smoothing (default: disabled)
arpi
parents: 7563
diff changeset
2885 /*
c135f7646036 new opt: -autosync, controls ao->get_delay() smoothing (default: disabled)
arpi
parents: 7563
diff changeset
2886 * 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
2887 * 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
2888 * 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
2889 * 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
2890 * 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
2891 * 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
2892 * 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
2893 * 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
2894 * autosync mode.)
c135f7646036 new opt: -autosync, controls ao->get_delay() smoothing (default: disabled)
arpi
parents: 7563
diff changeset
2895 */
8056
324b6e5387be A-V sync cleanup: sh_audio->timer replaced by sh_audio->delay, it contains
arpi
parents: 8030
diff changeset
2896 delay=sh_audio->delay;
7576
c135f7646036 new opt: -autosync, controls ao->get_delay() smoothing (default: disabled)
arpi
parents: 7563
diff changeset
2897 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
2898 }
c135f7646036 new opt: -autosync, controls ao->get_delay() smoothing (default: disabled)
arpi
parents: 7563
diff changeset
2899
8030
2b39ff3860b7 cleanup of .AVI timestamp calculation (ugly hack from mplayer.c removed,
arpi
parents: 8027
diff changeset
2900 #if 0
780
24e4e6e5aa1c audio sync cleanup and -bps fixed
arpi_esp
parents: 778
diff changeset
2901 if(pts_from_bps){
5610
fd196de4f1e9 cleanup. cosmetics only, no functional changes
arpi
parents: 5607
diff changeset
2902 // PTS = sample_no / samplerate
7735
197cee6aa59e always use rounded-up blocksize for .avi files (fixes Firestarter.mpg.avi)
arpi
parents: 7731
diff changeset
2903 unsigned int samples=
197cee6aa59e always use rounded-up blocksize for .avi files (fixes Firestarter.mpg.avi)
arpi
parents: 7731
diff changeset
2904 // (sh_audio->audio.dwSampleSize)?
197cee6aa59e always use rounded-up blocksize for .avi files (fixes Firestarter.mpg.avi)
arpi
parents: 7731
diff changeset
2905 // ((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
2906 ds_tell_block(d_audio); // <- used for VBR audio
3302
e75454b489df using audio.dwStart too... (for baittest.avi)
arpi
parents: 3274
diff changeset
2907 samples+=sh_audio->audio.dwStart; // offset
1498
6174b815b5f4 PTS calc updates, fixes, cleanups, mess...
arpi
parents: 1497
diff changeset
2908 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
2909 delay_corrected=1;
7749
48bf03297d48 more accurate a_pts calculation in AVI -bps (default) mode
arpi
parents: 7735
diff changeset
2910 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
2911 } else
2b39ff3860b7 cleanup of .AVI timestamp calculation (ugly hack from mplayer.c removed,
arpi
parents: 8027
diff changeset
2912 #endif
2b39ff3860b7 cleanup of .AVI timestamp calculation (ugly hack from mplayer.c removed,
arpi
parents: 8027
diff changeset
2913 {
780
24e4e6e5aa1c audio sync cleanup and -bps fixed
arpi_esp
parents: 778
diff changeset
2914 // 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
2915 a_pts=d_audio->pts;
1498
6174b815b5f4 PTS calc updates, fixes, cleanups, mess...
arpi
parents: 1497
diff changeset
2916 if(!delay_corrected) if(a_pts) delay_corrected=1;
6429
bff56f37f2ff 10l typo, noticed by Nick K.
arpi
parents: 6311
diff changeset
2917 #if 0
13577
606d90e03a2f printf --> mp_msg conversion
diego
parents: 13502
diff changeset
2918 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
2919 a_pts,
bff56f37f2ff 10l typo, noticed by Nick K.
arpi
parents: 6311
diff changeset
2920 ds_tell_pts(d_audio)/(float)sh_audio->i_bps,
bff56f37f2ff 10l typo, noticed by Nick K.
arpi
parents: 6311
diff changeset
2921 -sh_audio->a_in_buffer_len/(float)sh_audio->i_bps,
bff56f37f2ff 10l typo, noticed by Nick K.
arpi
parents: 6311
diff changeset
2922 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
2923 #endif
746
cd1f0d4de0b8 new audio playback and A-V sync code
arpi_esp
parents: 723
diff changeset
2924 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
2925 }
8965
14fa6a121a47 fixed the well-known DVD/DVB audio delay bug :)
arpi
parents: 8937
diff changeset
2926 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
2927
1567
5c7760aa4f94 printf->mp_msg/mp_dbg
arpi
parents: 1564
diff changeset
2928 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
2929
398
f5918fc8df10 more cleanup of video decoding
arpi_esp
parents: 396
diff changeset
2930 if(delay_corrected){
6173
020bfd8ac9ef - put back SystemTooSlow message
arpi
parents: 6138
diff changeset
2931 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
2932 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
2933 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
2934 if(AV_delay>0.5 && drop_frame_cnt>50 && drop_message==0){
6173
020bfd8ac9ef - put back SystemTooSlow message
arpi
parents: 6138
diff changeset
2935 ++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
2936 mp_msg(MSGT_AVSYNC,MSGL_WARN,MSGTR_SystemTooSlow);
6173
020bfd8ac9ef - put back SystemTooSlow message
arpi
parents: 6138
diff changeset
2937 }
1478
6f9167f0fcca 'too slow' message is fixed - better detection now based on both drop_cnt and A-V sync
arpi
parents: 1467
diff changeset
2938 x=AV_delay*0.1f;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2939 if(x<-max_pts_correction) x=-max_pts_correction; else
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2940 if(x> max_pts_correction) x= max_pts_correction;
780
24e4e6e5aa1c audio sync cleanup and -bps fixed
arpi_esp
parents: 778
diff changeset
2941 if(default_max_pts_correction>=0)
24e4e6e5aa1c audio sync cleanup and -bps fixed
arpi_esp
parents: 778
diff changeset
2942 max_pts_correction=default_max_pts_correction;
24e4e6e5aa1c audio sync cleanup and -bps fixed
arpi_esp
parents: 778
diff changeset
2943 else
24e4e6e5aa1c audio sync cleanup and -bps fixed
arpi_esp
parents: 778
diff changeset
2944 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
2945 if(!frame_time_remaining){ sh_audio->delay+=x; c_total+=x;} // correction
13857
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
2946 if(!quiet)
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
2947 print_status(a_pts - audio_delay - delay, AV_delay, c_total);
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2948 }
780
24e4e6e5aa1c audio sync cleanup and -bps fixed
arpi_esp
parents: 778
diff changeset
2949
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2950 } else {
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2951 // No audio:
1420
d97816161256 removed obsolote frame_corr_* stuff
arpi
parents: 1410
diff changeset
2952
1448
e795527de16a -quiet option patch by Adam Tla/lka atlka@pg.gda.pl
arpi
parents: 1439
diff changeset
2953 if(!quiet)
13857
38424a8eb0ea reworked the status line to avoid scrolling and remove duplicate code.
reimar
parents: 13794
diff changeset
2954 print_status(0, 0, 0);
1420
d97816161256 removed obsolote frame_corr_* stuff
arpi
parents: 1410
diff changeset
2955
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2956 }
5610
fd196de4f1e9 cleanup. cosmetics only, no functional changes
arpi
parents: 5607
diff changeset
2957
fd196de4f1e9 cleanup. cosmetics only, no functional changes
arpi
parents: 5607
diff changeset
2958 //============================ Auto QUALITY ============================
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2959
1439
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
2960 /*Output quality adjustments:*/
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
2961 if(auto_quality>0){
5610
fd196de4f1e9 cleanup. cosmetics only, no functional changes
arpi
parents: 5607
diff changeset
2962 current_module="autoq";
1496
8c3e93ef116d cleanup...
arpi
parents: 1487
diff changeset
2963 // float total=0.000001f * (GetTimer()-aq_total_time);
1439
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
2964 // if(output_quality<auto_quality && aq_sleep_time>0.05f*total)
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
2965 if(output_quality<auto_quality && aq_sleep_time>0)
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
2966 ++output_quality;
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
2967 else
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
2968 // if(output_quality>0 && aq_sleep_time<-0.05f*total)
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
2969 if(output_quality>1 && aq_sleep_time<0)
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
2970 --output_quality;
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
2971 else
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
2972 if(output_quality>0 && aq_sleep_time<-0.050f) // 50ms
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
2973 output_quality=0;
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
2974 // 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
2975 set_video_quality(sh_video,output_quality);
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
2976 }
dabb5054353a -autoq option...
arpi
parents: 1430
diff changeset
2977
5610
fd196de4f1e9 cleanup. cosmetics only, no functional changes
arpi
parents: 5607
diff changeset
2978 } // end if(sh_video)
fd196de4f1e9 cleanup. cosmetics only, no functional changes
arpi
parents: 5607
diff changeset
2979
fd196de4f1e9 cleanup. cosmetics only, no functional changes
arpi
parents: 5607
diff changeset
2980 //============================ Handle PAUSE ===============================
fd196de4f1e9 cleanup. cosmetics only, no functional changes
arpi
parents: 5607
diff changeset
2981
fd196de4f1e9 cleanup. cosmetics only, no functional changes
arpi
parents: 5607
diff changeset
2982 current_module="pause";
4587
886bf5274992 Audio only support. Include a fix in the asf demuxer opening.
albeu
parents: 4552
diff changeset
2983
1422
d02e0dcaf077 libvo2 support
arpi
parents: 1421
diff changeset
2984 #ifdef USE_OSD
220
5348fa1313fe OSD functionality improved
arpi_esp
parents: 215
diff changeset
2985 if(osd_visible){
5638
86663f1b9b00 new osd code, use osd objs to follow changes and do minimal updates
arpi
parents: 5627
diff changeset
2986 if (!--osd_visible){
86663f1b9b00 new osd code, use osd objs to follow changes and do minimal updates
arpi
parents: 5627
diff changeset
2987 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
2988 vo_osd_changed(OSDTYPE_PROGBAR);
1504
f4f686aed404 modified mplayer.c to rewert to PLAY after rewinding after 1 sec
atlka
parents: 1501
diff changeset
2989 if (osd_function != OSD_PAUSE)
f4f686aed404 modified mplayer.c to rewert to PLAY after rewinding after 1 sec
atlka
parents: 1501
diff changeset
2990 osd_function = OSD_PLAY;
f4f686aed404 modified mplayer.c to rewert to PLAY after rewinding after 1 sec
atlka
parents: 1501
diff changeset
2991 }
220
5348fa1313fe OSD functionality improved
arpi_esp
parents: 215
diff changeset
2992 }
1422
d02e0dcaf077 libvo2 support
arpi
parents: 1421
diff changeset
2993 #endif
371
55f9067ad176 OSD fixes, patch by Kebert Martin
arpi_esp
parents: 363
diff changeset
2994
55f9067ad176 OSD fixes, patch by Kebert Martin
arpi_esp
parents: 363
diff changeset
2995 if(osd_function==OSD_PAUSE){
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
2996 mp_cmd_t* cmd;
4587
886bf5274992 Audio only support. Include a fix in the asf demuxer opening.
albeu
parents: 4552
diff changeset
2997 if(!quiet) {
16992
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
2998 // small hack to display the pause message in the osd line
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
2999 // The pause string is: "\n == PAUSE == \r" so we need to
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
3000 // take the first and the last char out
17021
ded1cc937221 Make the osd command only switch between enabled/disabled when
albeu
parents: 16992
diff changeset
3001 if(use_term_osd) {
16992
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
3002 char msg[128] = MSGTR_Paused;
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
3003 int mlen = strlen(msg);
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
3004 msg[mlen-1] = '\0';
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
3005 set_osd_msg(OSD_MSG_PAUSE,1,0,"%s",msg+1);
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
3006 update_osd_msg();
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
3007 } else
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
3008 mp_msg(MSGT_CPLAYER,MSGL_STATUS,MSGTR_Paused);
15789
32d9c8a0a02b adds some more -identify output, patch by kiriuja < mplayer DASH patches PAM en DASH directo POUM net>
gpoirier
parents: 15706
diff changeset
3009 if (identify)
32d9c8a0a02b adds some more -identify output, patch by kiriuja < mplayer DASH patches PAM en DASH directo POUM net>
gpoirier
parents: 15706
diff changeset
3010 mp_msg(MSGT_GLOBAL, MSGL_INFO, "ID_PAUSED\n");
4587
886bf5274992 Audio only support. Include a fix in the asf demuxer opening.
albeu
parents: 4552
diff changeset
3011 fflush(stdout);
886bf5274992 Audio only support. Include a fix in the asf demuxer opening.
albeu
parents: 4552
diff changeset
3012 }
1793
ba11d77c587a gui status maintaining - now pause from console works, and gui display is in sync with osd
arpi
parents: 1792
diff changeset
3013 #ifdef HAVE_NEW_GUI
4974
5da7b1522a9f small bug fixed and workarounds :(
pontscho
parents: 4965
diff changeset
3014 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
3015 #endif
5511
7a24a067f0af vo_config_count now counts calls to vo->config()
arpi
parents: 5507
diff changeset
3016 if (video_out && sh_video && vo_config_count)
4754
ad892563d9c4 Added VOCTRL_PAUSE and VOCTRL_RESUME
mswitch
parents: 4747
diff changeset
3017 video_out->control(VOCTRL_PAUSE, NULL);
ad892563d9c4 Added VOCTRL_PAUSE and VOCTRL_RESUME
mswitch
parents: 4747
diff changeset
3018
1369
7a2f1881b776 a_frame, v_frame killed, using sh_audio/video->timer. has_audio not more used after initialization.
arpi
parents: 1353
diff changeset
3019 if (audio_out && sh_audio)
1156
5dc01778e055 has_audio checkings at reset and exit added
al3x
parents: 1125
diff changeset
3020 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
3021
13603
80fc8f48f14c Do not loose commands while paused.
reimar
parents: 13577
diff changeset
3022 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
3023 if(sh_video && video_out && vo_config_count) video_out->check_events();
1709
a4e0211455d8 GUI integration, step 1
arpi
parents: 1694
diff changeset
3024 #ifdef HAVE_NEW_GUI
a4e0211455d8 GUI integration, step 1
arpi
parents: 1694
diff changeset
3025 if(use_gui){
4798
c39affa2b376 new interface ? :)
pontscho
parents: 4788
diff changeset
3026 guiEventHandling();
6619
f554e7271587 fix volume handling ( step 2 ) -- add balance support and some code cleanup and fix
pontscho
parents: 6590
diff changeset
3027 guiGetEvent( guiReDraw,NULL );
4963
13262bd21965 small changes
pontscho
parents: 4950
diff changeset
3028 if(guiIntfStruct.Playing!=2 || (rel_seek_secs || abs_seek_pos)) break;
1709
a4e0211455d8 GUI integration, step 1
arpi
parents: 1694
diff changeset
3029 }
a4e0211455d8 GUI integration, step 1
arpi
parents: 1694
diff changeset
3030 #endif
8198
1935017c0f71 Experimantal OSD menu
albeu
parents: 8164
diff changeset
3031 #ifdef HAVE_MENU
1935017c0f71 Experimantal OSD menu
albeu
parents: 8164
diff changeset
3032 if(vf_menu)
1935017c0f71 Experimantal OSD menu
albeu
parents: 8164
diff changeset
3033 vf_menu_pause_update(vf_menu);
1935017c0f71 Experimantal OSD menu
albeu
parents: 8164
diff changeset
3034 #endif
9464
a4e50ab9ac14 3x10l found by Dan Christiansen <danchr@daimi.au.dk>
alex
parents: 9380
diff changeset
3035 usec_sleep(20000);
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
3036 }
13768
955ad54a9aab cmd can be NULL when leaving the paused mode and using the GUI
reimar
parents: 13743
diff changeset
3037 if (cmd && cmd->id == MP_CMD_PAUSE) {
13603
80fc8f48f14c Do not loose commands while paused.
reimar
parents: 13577
diff changeset
3038 cmd = mp_input_get_cmd(0,1,0);
5046
b3bd4b29a03b remove obsoleted function (mplResize)
pontscho
parents: 5015
diff changeset
3039 mp_cmd_free(cmd);
13603
80fc8f48f14c Do not loose commands while paused.
reimar
parents: 13577
diff changeset
3040 }
723
c3e0bdb64027 add gui support
pontscho
parents: 722
diff changeset
3041 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
3042 if (audio_out && sh_audio)
1156
5dc01778e055 has_audio checkings at reset and exit added
al3x
parents: 1125
diff changeset
3043 audio_out->resume(); // resume audio
5511
7a24a067f0af vo_config_count now counts calls to vo->config()
arpi
parents: 5507
diff changeset
3044 if (video_out && sh_video && vo_config_count)
4754
ad892563d9c4 Added VOCTRL_PAUSE and VOCTRL_RESUME
mswitch
parents: 4747
diff changeset
3045 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
3046 (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
3047 #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
3048 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
3049 {
a4bbda72ce86 fix two small bug and add multimedia keyboard support ( i tested with Acer AirKey V only )
pontscho
parents: 6173
diff changeset
3050 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
3051 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
3052 }
1793
ba11d77c587a gui status maintaining - now pause from console works, and gui display is in sync with osd
arpi
parents: 1792
diff changeset
3053 #endif
371
55f9067ad176 OSD fixes, patch by Kebert Martin
arpi_esp
parents: 363
diff changeset
3054 }
55f9067ad176 OSD fixes, patch by Kebert Martin
arpi_esp
parents: 363
diff changeset
3055
5610
fd196de4f1e9 cleanup. cosmetics only, no functional changes
arpi
parents: 5607
diff changeset
3056 // handle -sstep
2436
18c12656c816 -sstep patch by Aleksander V. Dyomin <fly@shax.ru>
arpi
parents: 2365
diff changeset
3057 if(step_sec>0) {
18c12656c816 -sstep patch by Aleksander V. Dyomin <fly@shax.ru>
arpi
parents: 2365
diff changeset
3058 osd_function=OSD_FFW;
18c12656c816 -sstep patch by Aleksander V. Dyomin <fly@shax.ru>
arpi
parents: 2365
diff changeset
3059 rel_seek_secs+=step_sec;
18c12656c816 -sstep patch by Aleksander V. Dyomin <fly@shax.ru>
arpi
parents: 2365
diff changeset
3060 }
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
3061
5489
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
3062 #ifdef USE_DVDNAV
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
3063 if (stream->type==STREAMTYPE_DVDNAV && dvd_nav_still)
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
3064 dvdnav_stream_sleeping((dvdnav_priv_t*)stream->priv);
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
3065 #endif
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
3066
8531
1aa2c9b460af Merged EDL 0.5 patch - it's something like Quicktime's edit lists.
arpi
parents: 8494
diff changeset
3067 //================= EDL =========================================
1aa2c9b460af Merged EDL 0.5 patch - it's something like Quicktime's edit lists.
arpi
parents: 8494
diff changeset
3068
1aa2c9b460af Merged EDL 0.5 patch - it's something like Quicktime's edit lists.
arpi
parents: 8494
diff changeset
3069 #ifdef USE_EDL
13168
ce046ef860da EDL enhancement/fixes:
rtognimp
parents: 13132
diff changeset
3070 if( next_edl_record ) { // Are we (still?) doing EDL?
12207
3c148bdd86d9 Fix segfault if EDL is used without video
rtognimp
parents: 12145
diff changeset
3071 if ( !sh_video ) {
13358
567875b88aab Hardcoded EDL messages moved to help_mp-en.h, Doxygen comments added, patch
diego
parents: 13353
diff changeset
3072 mp_msg( MSGT_CPLAYER, MSGL_ERR, MSGTR_EdlNOsh_video );
14807
664b06b907cb Some to-be-redundant EDL code moved to edl.c with mencoder's edl in mind. Stack handling improvements, Patch by Oded Shimon
reynaldo
parents: 14718
diff changeset
3073 free_edl(edl_records);
13868
707a29256fd3 Fix broken seek while on edl and audio only, spoted by Oded Shimon
reynaldo
parents: 13867
diff changeset
3074 next_edl_record = NULL;
707a29256fd3 Fix broken seek while on edl and audio only, spoted by Oded Shimon
reynaldo
parents: 13867
diff changeset
3075 edl_records = NULL;
12207
3c148bdd86d9 Fix segfault if EDL is used without video
rtognimp
parents: 12145
diff changeset
3076 } else {
8966
arpi
parents: 8965
diff changeset
3077 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
3078 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
3079 osd_function = OSD_FFW;
1aa2c9b460af Merged EDL 0.5 patch - it's something like Quicktime's edit lists.
arpi
parents: 8494
diff changeset
3080 abs_seek_pos = 0;
1aa2c9b460af Merged EDL 0.5 patch - it's something like Quicktime's edit lists.
arpi
parents: 8494
diff changeset
3081 rel_seek_secs = next_edl_record->length_sec;
13773
60c66b5aa2e1 Fixed 2 debug edl messages
reynaldo
parents: 13768
diff changeset
3082 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
3083 edl_decision = 1;
1aa2c9b460af Merged EDL 0.5 patch - it's something like Quicktime's edit lists.
arpi
parents: 8494
diff changeset
3084 } else if( next_edl_record->action == EDL_MUTE ) {
13882
8a928d5b42b8 Replaces edl_mute_count with togle making code more understandable, other trivial list suggested changes too, Patch by Oded Shimon
reynaldo
parents: 13868
diff changeset
3085 edl_muted = !edl_muted;
8a928d5b42b8 Replaces edl_mute_count with togle making code more understandable, other trivial list suggested changes too, Patch by Oded Shimon
reynaldo
parents: 13868
diff changeset
3086 if ((user_muted | edl_muted) != mixer.muted) mixer_mute(&mixer);
13773
60c66b5aa2e1 Fixed 2 debug edl messages
reynaldo
parents: 13768
diff changeset
3087 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
3088 }
13168
ce046ef860da EDL enhancement/fixes:
rtognimp
parents: 13132
diff changeset
3089 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
3090 }
12207
3c148bdd86d9 Fix segfault if EDL is used without video
rtognimp
parents: 12145
diff changeset
3091 }
8531
1aa2c9b460af Merged EDL 0.5 patch - it's something like Quicktime's edit lists.
arpi
parents: 8494
diff changeset
3092 }
1aa2c9b460af Merged EDL 0.5 patch - it's something like Quicktime's edit lists.
arpi
parents: 8494
diff changeset
3093 #endif
1aa2c9b460af Merged EDL 0.5 patch - it's something like Quicktime's edit lists.
arpi
parents: 8494
diff changeset
3094
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
3095 //================= Keyboard events, SEEKing ====================
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
3096
5610
fd196de4f1e9 cleanup. cosmetics only, no functional changes
arpi
parents: 5607
diff changeset
3097 current_module="key_events";
fd196de4f1e9 cleanup. cosmetics only, no functional changes
arpi
parents: 5607
diff changeset
3098
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
3099 {
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
3100 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
3101 int brk_cmd = 0;
13603
80fc8f48f14c Do not loose commands while paused.
reimar
parents: 13577
diff changeset
3102 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
3103 switch(cmd->id) {
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
3104 case MP_CMD_SEEK : {
14718
11376fd550ac Make seek command parameter float.
reimar
parents: 14684
diff changeset
3105 float v;
11376fd550ac Make seek command parameter float.
reimar
parents: 14684
diff changeset
3106 int abs;
16938
2099e842ffb0 there is no sh_video for audio only files
faust3
parents: 16933
diff changeset
3107 if(sh_video)
2099e842ffb0 there is no sh_video for audio only files
faust3
parents: 16933
diff changeset
3108 osd_show_percentage = sh_video->fps;
14718
11376fd550ac Make seek command parameter float.
reimar
parents: 14684
diff changeset
3109 v = cmd->args[0].v.f;
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
3110 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
3111 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
3112 abs_seek_pos = 1;
9720e88cd0bc This tiny patch adds "type=2" absolute seconds seek capability.
arpi
parents: 7419
diff changeset
3113 if(sh_video)
9720e88cd0bc This tiny patch adds "type=2" absolute seconds seek capability.
arpi
parents: 7419
diff changeset
3114 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
3115 rel_seek_secs = v;
9720e88cd0bc This tiny patch adds "type=2" absolute seconds seek capability.
arpi
parents: 7419
diff changeset
3116 }
9720e88cd0bc This tiny patch adds "type=2" absolute seconds seek capability.
arpi
parents: 7419
diff changeset
3117 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
3118 abs_seek_pos = 3;
5798
pontscho
parents: 5797
diff changeset
3119 if(sh_video)
pontscho
parents: 5797
diff changeset
3120 osd_function= (v > sh_video->timer) ? OSD_FFW : OSD_REW;
pontscho
parents: 5797
diff changeset
3121 rel_seek_secs = v/100.0;
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
3122 }
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
3123 else {
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
3124 rel_seek_secs+= v;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
3125 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
3126 }
10409
4c9ca4819bed Commands are read in a loop, but for some commands we need to break
albeu
parents: 10397
diff changeset
3127 brk_cmd = 1;
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
3128 } break;
8531
1aa2c9b460af Merged EDL 0.5 patch - it's something like Quicktime's edit lists.
arpi
parents: 8494
diff changeset
3129 #ifdef USE_EDL
1aa2c9b460af Merged EDL 0.5 patch - it's something like Quicktime's edit lists.
arpi
parents: 8494
diff changeset
3130 case MP_CMD_EDL_MARK:
1aa2c9b460af Merged EDL 0.5 patch - it's something like Quicktime's edit lists.
arpi
parents: 8494
diff changeset
3131 if( edl_fd ) {
8966
arpi
parents: 8965
diff changeset
3132 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
3133 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
3134 }
1aa2c9b460af Merged EDL 0.5 patch - it's something like Quicktime's edit lists.
arpi
parents: 8494
diff changeset
3135 break;
1aa2c9b460af Merged EDL 0.5 patch - it's something like Quicktime's edit lists.
arpi
parents: 8494
diff changeset
3136 #endif
13339
1c787349d286 slave mode command to switch aspect ratio, patch by Aurelien Jacobs <aurel at gnuage.org>
faust3
parents: 13338
diff changeset
3137 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
3138 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
3139 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
3140 else
1c787349d286 slave mode command to switch aspect ratio, patch by Aurelien Jacobs <aurel at gnuage.org>
faust3
parents: 13338
diff changeset
3141 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
3142 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
3143 } break;
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
3144 case MP_CMD_AUDIO_DELAY : {
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
3145 float v = cmd->args[0].v.f;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
3146 audio_delay += v;
16992
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
3147 set_osd_msg(OSD_MSG_AV_DELAY,1,osd_duration,MSGTR_OSDAVDelay,
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
3148 ROUND(audio_delay*1000));
8056
324b6e5387be A-V sync cleanup: sh_audio->timer replaced by sh_audio->delay, it contains
arpi
parents: 8030
diff changeset
3149 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
3150 } break;
13710
d7af73cc38da allow changing playback speed during playback.
reimar
parents: 13684
diff changeset
3151 case MP_CMD_SPEED_INCR : {
d7af73cc38da allow changing playback speed during playback.
reimar
parents: 13684
diff changeset
3152 float v = cmd->args[0].v.f;
d7af73cc38da allow changing playback speed during playback.
reimar
parents: 13684
diff changeset
3153 playback_speed += v;
16992
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
3154 set_osd_msg(OSD_MSG_SPEED,1,osd_duration,MSGTR_OSDSpeed, playback_speed);
13710
d7af73cc38da allow changing playback speed during playback.
reimar
parents: 13684
diff changeset
3155 build_afilter_chain(sh_audio, &ao_data);
d7af73cc38da allow changing playback speed during playback.
reimar
parents: 13684
diff changeset
3156 } break;
d7af73cc38da allow changing playback speed during playback.
reimar
parents: 13684
diff changeset
3157 case MP_CMD_SPEED_MULT : {
d7af73cc38da allow changing playback speed during playback.
reimar
parents: 13684
diff changeset
3158 float v = cmd->args[0].v.f;
d7af73cc38da allow changing playback speed during playback.
reimar
parents: 13684
diff changeset
3159 playback_speed *= v;
16992
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
3160 set_osd_msg(OSD_MSG_SPEED,1,osd_duration,MSGTR_OSDSpeed, playback_speed);
13710
d7af73cc38da allow changing playback speed during playback.
reimar
parents: 13684
diff changeset
3161 build_afilter_chain(sh_audio, &ao_data);
d7af73cc38da allow changing playback speed during playback.
reimar
parents: 13684
diff changeset
3162 } break;
d7af73cc38da allow changing playback speed during playback.
reimar
parents: 13684
diff changeset
3163 case MP_CMD_SPEED_SET : {
d7af73cc38da allow changing playback speed during playback.
reimar
parents: 13684
diff changeset
3164 float v = cmd->args[0].v.f;
d7af73cc38da allow changing playback speed during playback.
reimar
parents: 13684
diff changeset
3165 playback_speed = v;
16992
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
3166 set_osd_msg(OSD_MSG_SPEED,1,osd_duration,MSGTR_OSDSpeed, playback_speed);
13710
d7af73cc38da allow changing playback speed during playback.
reimar
parents: 13684
diff changeset
3167 build_afilter_chain(sh_audio, &ao_data);
d7af73cc38da allow changing playback speed during playback.
reimar
parents: 13684
diff changeset
3168 } break;
13626
741649fe31cb allow to step only one frame forward by pressing s.
reimar
parents: 13603
diff changeset
3169 case MP_CMD_FRAME_STEP :
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
3170 case MP_CMD_PAUSE : {
13991
28a6f0847c58 add "pausing" prefix for MPlayer commands
reimar
parents: 13956
diff changeset
3171 cmd->pausing = 1;
10409
4c9ca4819bed Commands are read in a loop, but for some commands we need to break
albeu
parents: 10397
diff changeset
3172 brk_cmd = 1;
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
3173 } break;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
3174 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
3175 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
3176 }
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
3177 case MP_CMD_GRAB_FRAMES : {
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
3178 grab_frames=2;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
3179 } break;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
3180 case MP_CMD_PLAY_TREE_STEP : {
8198
1935017c0f71 Experimantal OSD menu
albeu
parents: 8164
diff changeset
3181 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
3182 int force = cmd->args[1].v.i;
aeef7f3c2096 Now enter key quit if no next file is avaible
albeu
parents: 5129
diff changeset
3183
9291
64b8c5a07c2c - It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents: 9217
diff changeset
3184 #ifdef HAVE_NEW_GUI
64b8c5a07c2c - It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents: 9217
diff changeset
3185 if (use_gui) {
64b8c5a07c2c - It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents: 9217
diff changeset
3186 int i=0;
64b8c5a07c2c - It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents: 9217
diff changeset
3187 if (n>0)
64b8c5a07c2c - It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents: 9217
diff changeset
3188 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
3189 mplNext();
64b8c5a07c2c - It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents: 9217
diff changeset
3190 else
64b8c5a07c2c - It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents: 9217
diff changeset
3191 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
3192 mplPrev();
64b8c5a07c2c - It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents: 9217
diff changeset
3193 } else
64b8c5a07c2c - It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents: 9217
diff changeset
3194 #endif
64b8c5a07c2c - It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents: 9217
diff changeset
3195 {
64b8c5a07c2c - It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents: 9217
diff changeset
3196 if(!force && playtree_iter) {
5135
aeef7f3c2096 Now enter key quit if no next file is avaible
albeu
parents: 5129
diff changeset
3197 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
3198
aeef7f3c2096 Now enter key quit if no next file is avaible
albeu
parents: 5129
diff changeset
3199 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
3200 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
3201 play_tree_iter_free(i);
aeef7f3c2096 Now enter key quit if no next file is avaible
albeu
parents: 5129
diff changeset
3202 } else
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
3203 eof = (n > 0) ? PT_NEXT_ENTRY : PT_PREV_ENTRY;
8198
1935017c0f71 Experimantal OSD menu
albeu
parents: 8164
diff changeset
3204 if(eof)
1935017c0f71 Experimantal OSD menu
albeu
parents: 8164
diff changeset
3205 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
3206 brk_cmd = 1;
9291
64b8c5a07c2c - It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents: 9217
diff changeset
3207 }
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
3208 } break;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
3209 case MP_CMD_PLAY_TREE_UP_STEP : {
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
3210 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
3211 int force = cmd->args[1].v.i;
aeef7f3c2096 Now enter key quit if no next file is avaible
albeu
parents: 5129
diff changeset
3212
9291
64b8c5a07c2c - It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents: 9217
diff changeset
3213 if(!force && playtree_iter) {
5135
aeef7f3c2096 Now enter key quit if no next file is avaible
albeu
parents: 5129
diff changeset
3214 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
3215 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
3216 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
3217 play_tree_iter_free(i);
aeef7f3c2096 Now enter key quit if no next file is avaible
albeu
parents: 5129
diff changeset
3218 } else
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
3219 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
3220 brk_cmd = 1;
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
3221 } break;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
3222 case MP_CMD_PLAY_ALT_SRC_STEP : {
9352
pontscho
parents: 9346
diff changeset
3223 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
3224 int v = cmd->args[0].v.i;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
3225 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
3226 eof = PT_NEXT_SRC;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
3227 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
3228 eof = PT_PREV_SRC;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
3229 }
10409
4c9ca4819bed Commands are read in a loop, but for some commands we need to break
albeu
parents: 10397
diff changeset
3230 brk_cmd = 1;
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
3231 } break;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
3232 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
3233 #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
3234 if (sh_video) {
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
3235 int abs= cmd->args[1].v.i;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
3236 float v = cmd->args[0].v.f;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
3237 if(abs)
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
3238 sub_delay = v;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
3239 else
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
3240 sub_delay += v;
16992
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
3241 set_osd_msg(OSD_MSG_SUB_DELAY,1,osd_duration,
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
3242 MSGTR_OSDSubDelay, ROUND(sub_delay*1000));
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
3243 }
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
3244 #endif
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
3245 } break;
8365
423a19edc0a4 This patch makes it possible to navigate among the subtitles while
arpi
parents: 8364
diff changeset
3246 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
3247 #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
3248 if (sh_video) {
8365
423a19edc0a4 This patch makes it possible to navigate among the subtitles while
arpi
parents: 8364
diff changeset
3249 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
3250 step_sub(subdata, sh_video->pts, movement);
16992
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
3251 set_osd_msg(OSD_MSG_SUB_DELAY,1,osd_duration,
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
3252 MSGTR_OSDSubDelay, ROUND(sub_delay*1000));
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
3253 }
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
3254 #endif
8365
423a19edc0a4 This patch makes it possible to navigate among the subtitles while
arpi
parents: 8364
diff changeset
3255 } break;
14684
a4767edef10d command to log current subtitle to file
henry
parents: 14644
diff changeset
3256 case MP_CMD_SUB_LOG : {
a4767edef10d command to log current subtitle to file
henry
parents: 14644
diff changeset
3257 #ifdef USE_SUB
a4767edef10d command to log current subtitle to file
henry
parents: 14644
diff changeset
3258 log_sub();
a4767edef10d command to log current subtitle to file
henry
parents: 14644
diff changeset
3259 #endif
a4767edef10d command to log current subtitle to file
henry
parents: 14644
diff changeset
3260 } 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
3261 case MP_CMD_OSD : {
4587
886bf5274992 Audio only support. Include a fix in the asf demuxer opening.
albeu
parents: 4552
diff changeset
3262 int v = cmd->args[0].v.i;
17021
ded1cc937221 Make the osd command only switch between enabled/disabled when
albeu
parents: 16992
diff changeset
3263 int max = use_term_osd ? MAX_TERM_OSD_LEVEL : MAX_OSD_LEVEL;
ded1cc937221 Make the osd command only switch between enabled/disabled when
albeu
parents: 16992
diff changeset
3264 if(osd_level > max) osd_level = max;
4587
886bf5274992 Audio only support. Include a fix in the asf demuxer opening.
albeu
parents: 4552
diff changeset
3265 if(v < 0)
17021
ded1cc937221 Make the osd command only switch between enabled/disabled when
albeu
parents: 16992
diff changeset
3266 osd_level=(osd_level+1)%(max+1);
4587
886bf5274992 Audio only support. Include a fix in the asf demuxer opening.
albeu
parents: 4552
diff changeset
3267 else
17021
ded1cc937221 Make the osd command only switch between enabled/disabled when
albeu
parents: 16992
diff changeset
3268 osd_level= v > max ? max : v;
15862
30cd1a5f4274 Make the OSD display state information when cycling OSD states with 'o'.
diego
parents: 15811
diff changeset
3269 /* Show OSD state when disabled, but not when an explicit
30cd1a5f4274 Make the OSD display state information when cycling OSD states with 'o'.
diego
parents: 15811
diff changeset
3270 argument is given to the osd command, i.e. in slave mode. */
15863
7689a7c41225 simplify osd-status display, and allow e.g. osd -2 to get the old behaviour
reimar
parents: 15862
diff changeset
3271 if (v == -1 && osd_level <= 1)
16992
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
3272 set_osd_msg(OSD_MSG_OSD_STATUS,0,osd_duration,
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
3273 MSGTR_OSDosd, osd_level ? MSGTR_OSDenabled : MSGTR_OSDdisabled);
17057
d301c1833d12 Add a function to remove osd msg and use it to remove the "OSD: enabled"
albeu
parents: 17021
diff changeset
3274 else
d301c1833d12 Add a function to remove osd msg and use it to remove the "OSD: enabled"
albeu
parents: 17021
diff changeset
3275 rm_osd_msg(OSD_MSG_OSD_STATUS);
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
3276 } 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
3277 case MP_CMD_OSD_SHOW_TEXT : {
16992
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
3278 set_osd_msg(OSD_MSG_TEXT,1,osd_duration,"%64s",cmd->args[0].v.s);
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
3279 } break;
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
3280 case MP_CMD_VOLUME : {
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
3281 int v = cmd->args[0].v.i;
7055
5a6616a088f2 new slave volume command done :
arpi
parents: 7019
diff changeset
3282
5a6616a088f2 new slave volume command done :
arpi
parents: 7019
diff changeset
3283 // start change for absolute volume value
5a6616a088f2 new slave volume command done :
arpi
parents: 7019
diff changeset
3284 int abs = (cmd->nargs > 1) ? cmd->args[1].v.i : 0;
5a6616a088f2 new slave volume command done :
arpi
parents: 7019
diff changeset
3285
13867
4b9c901a6d23 Fix EDL mute behavior, Patch by Oded Shimon
reynaldo
parents: 13858
diff changeset
3286 #ifdef USE_EDL
13882
8a928d5b42b8 Replaces edl_mute_count with togle making code more understandable, other trivial list suggested changes too, Patch by Oded Shimon
reynaldo
parents: 13868
diff changeset
3287 if (edl_muted) break;
13867
4b9c901a6d23 Fix EDL mute behavior, Patch by Oded Shimon
reynaldo
parents: 13858
diff changeset
3288 user_muted = 0;
4b9c901a6d23 Fix EDL mute behavior, Patch by Oded Shimon
reynaldo
parents: 13858
diff changeset
3289 #endif
7055
5a6616a088f2 new slave volume command done :
arpi
parents: 7019
diff changeset
3290 if( abs )
5a6616a088f2 new slave volume command done :
arpi
parents: 7019
diff changeset
3291 {
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
3292 mixer_setvolume(&mixer, (float)v, (float)v );
7055
5a6616a088f2 new slave volume command done :
arpi
parents: 7019
diff changeset
3293 } else {
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
3294 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
3295 mixer_incvolume(&mixer);
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
3296 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
3297 mixer_decvolume(&mixer);
7055
5a6616a088f2 new slave volume command done :
arpi
parents: 7019
diff changeset
3298 }
5a6616a088f2 new slave volume command done :
arpi
parents: 7019
diff changeset
3299
16992
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
3300 if(1){
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
3301 float 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
3302 mixer_getbothvolume(&mixer, &vol);
16992
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
3303 set_osd_bar(OSD_VOLUME,"Volume",0,100,vol);
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
3304 }
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
3305 } break;
6940
335d827e8201 10l bug (missing break;) found by Jim Hawkins <jim@jawkins.com>
arpi
parents: 6930
diff changeset
3306 case MP_CMD_MUTE:
13867
4b9c901a6d23 Fix EDL mute behavior, Patch by Oded Shimon
reynaldo
parents: 13858
diff changeset
3307 #ifdef USE_EDL
13882
8a928d5b42b8 Replaces edl_mute_count with togle making code more understandable, other trivial list suggested changes too, Patch by Oded Shimon
reynaldo
parents: 13868
diff changeset
3308 user_muted = !user_muted;
8a928d5b42b8 Replaces edl_mute_count with togle making code more understandable, other trivial list suggested changes too, Patch by Oded Shimon
reynaldo
parents: 13868
diff changeset
3309 if ((edl_muted | user_muted) != mixer.muted)
13867
4b9c901a6d23 Fix EDL mute behavior, Patch by Oded Shimon
reynaldo
parents: 13858
diff changeset
3310 #endif
12672
9709ce101949 New 'Mixer API' with ability to change volume through libaf (this part was written by Reimar Doffinger) and lesser global variables
alex
parents: 12550
diff changeset
3311 mixer_mute(&mixer);
6940
335d827e8201 10l bug (missing break;) found by Jim Hawkins <jim@jawkins.com>
arpi
parents: 6930
diff changeset
3312 break;
6818
b9a6817d9ff3 Add loadfile and loadlist commands. May be buggy if the filename contain some
albeu
parents: 6796
diff changeset
3313 case MP_CMD_LOADFILE : {
b9a6817d9ff3 Add loadfile and loadlist commands. May be buggy if the filename contain some
albeu
parents: 6796
diff changeset
3314 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
3315 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
3316
16227
4b2b8c90d370 loadfile/loadlist can now also add files to the playlist
reimar
parents: 16175
diff changeset
3317 if (cmd->args[1].v.i) // append
4b2b8c90d370 loadfile/loadlist can now also add files to the playlist
reimar
parents: 16175
diff changeset
3318 play_tree_append_entry(playtree, e);
4b2b8c90d370 loadfile/loadlist can now also add files to the playlist
reimar
parents: 16175
diff changeset
3319 else {
6818
b9a6817d9ff3 Add loadfile and loadlist commands. May be buggy if the filename contain some
albeu
parents: 6796
diff changeset
3320 // 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
3321 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
3322 /* NOP */;
b9a6817d9ff3 Add loadfile and loadlist commands. May be buggy if the filename contain some
albeu
parents: 6796
diff changeset
3323 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
3324 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
3325 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
3326 eof = PT_NEXT_SRC;
16227
4b2b8c90d370 loadfile/loadlist can now also add files to the playlist
reimar
parents: 16175
diff changeset
3327 }
10409
4c9ca4819bed Commands are read in a loop, but for some commands we need to break
albeu
parents: 10397
diff changeset
3328 brk_cmd = 1;
6818
b9a6817d9ff3 Add loadfile and loadlist commands. May be buggy if the filename contain some
albeu
parents: 6796
diff changeset
3329 } break;
b9a6817d9ff3 Add loadfile and loadlist commands. May be buggy if the filename contain some
albeu
parents: 6796
diff changeset
3330 case MP_CMD_LOADLIST : {
b9a6817d9ff3 Add loadfile and loadlist commands. May be buggy if the filename contain some
albeu
parents: 6796
diff changeset
3331 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
3332 if(!e)
6930
cae1dd6343e7 moved messages to help_mp-??.h
jaf
parents: 6921
diff changeset
3333 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
3334 else {
16227
4b2b8c90d370 loadfile/loadlist can now also add files to the playlist
reimar
parents: 16175
diff changeset
3335 if (cmd->args[1].v.i) // append
4b2b8c90d370 loadfile/loadlist can now also add files to the playlist
reimar
parents: 16175
diff changeset
3336 play_tree_append_entry(playtree, e);
4b2b8c90d370 loadfile/loadlist can now also add files to the playlist
reimar
parents: 16175
diff changeset
3337 else {
6818
b9a6817d9ff3 Add loadfile and loadlist commands. May be buggy if the filename contain some
albeu
parents: 6796
diff changeset
3338 // 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
3339 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
3340 /* NOP */;
b9a6817d9ff3 Add loadfile and loadlist commands. May be buggy if the filename contain some
albeu
parents: 6796
diff changeset
3341 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
3342 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
3343 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
3344 eof = PT_NEXT_SRC;
16227
4b2b8c90d370 loadfile/loadlist can now also add files to the playlist
reimar
parents: 16175
diff changeset
3345 }
6818
b9a6817d9ff3 Add loadfile and loadlist commands. May be buggy if the filename contain some
albeu
parents: 6796
diff changeset
3346 }
10409
4c9ca4819bed Commands are read in a loop, but for some commands we need to break
albeu
parents: 10397
diff changeset
3347 brk_cmd = 1;
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
3348 } break;
7517
9d433771b6d0 -vf eq2, LUT-based brightness/contrast/gamma correction (Y-only)
arpi
parents: 7516
diff changeset
3349 case MP_CMD_GAMMA : {
9d433771b6d0 -vf eq2, LUT-based brightness/contrast/gamma correction (Y-only)
arpi
parents: 7516
diff changeset
3350 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
3351
9d433771b6d0 -vf eq2, LUT-based brightness/contrast/gamma correction (Y-only)
arpi
parents: 7516
diff changeset
3352 if (!sh_video)
9d433771b6d0 -vf eq2, LUT-based brightness/contrast/gamma correction (Y-only)
arpi
parents: 7516
diff changeset
3353 break;
9d433771b6d0 -vf eq2, LUT-based brightness/contrast/gamma correction (Y-only)
arpi
parents: 7516
diff changeset
3354
9d433771b6d0 -vf eq2, LUT-based brightness/contrast/gamma correction (Y-only)
arpi
parents: 7516
diff changeset
3355 if (vo_gamma_gamma == 1000)
9d433771b6d0 -vf eq2, LUT-based brightness/contrast/gamma correction (Y-only)
arpi
parents: 7516
diff changeset
3356 {
9d433771b6d0 -vf eq2, LUT-based brightness/contrast/gamma correction (Y-only)
arpi
parents: 7516
diff changeset
3357 vo_gamma_gamma = 0;
9d433771b6d0 -vf eq2, LUT-based brightness/contrast/gamma correction (Y-only)
arpi
parents: 7516
diff changeset
3358 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
3359 }
9d433771b6d0 -vf eq2, LUT-based brightness/contrast/gamma correction (Y-only)
arpi
parents: 7516
diff changeset
3360
9d433771b6d0 -vf eq2, LUT-based brightness/contrast/gamma correction (Y-only)
arpi
parents: 7516
diff changeset
3361 if (abs)
9d433771b6d0 -vf eq2, LUT-based brightness/contrast/gamma correction (Y-only)
arpi
parents: 7516
diff changeset
3362 vo_gamma_gamma = v;
9d433771b6d0 -vf eq2, LUT-based brightness/contrast/gamma correction (Y-only)
arpi
parents: 7516
diff changeset
3363 else
9d433771b6d0 -vf eq2, LUT-based brightness/contrast/gamma correction (Y-only)
arpi
parents: 7516
diff changeset
3364 vo_gamma_gamma += v;
9d433771b6d0 -vf eq2, LUT-based brightness/contrast/gamma correction (Y-only)
arpi
parents: 7516
diff changeset
3365
9d433771b6d0 -vf eq2, LUT-based brightness/contrast/gamma correction (Y-only)
arpi
parents: 7516
diff changeset
3366 if (vo_gamma_gamma > 100)
9d433771b6d0 -vf eq2, LUT-based brightness/contrast/gamma correction (Y-only)
arpi
parents: 7516
diff changeset
3367 vo_gamma_gamma = 100;
9d433771b6d0 -vf eq2, LUT-based brightness/contrast/gamma correction (Y-only)
arpi
parents: 7516
diff changeset
3368 else if (vo_gamma_gamma < -100)
9d433771b6d0 -vf eq2, LUT-based brightness/contrast/gamma correction (Y-only)
arpi
parents: 7516
diff changeset
3369 vo_gamma_gamma = -100;
16992
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
3370 if (set_video_colors(sh_video, "gamma", vo_gamma_gamma))
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
3371 set_osd_bar(OSD_BRIGHTNESS,"Gamma",-100,100,vo_gamma_gamma);
7517
9d433771b6d0 -vf eq2, LUT-based brightness/contrast/gamma correction (Y-only)
arpi
parents: 7516
diff changeset
3372 } break;
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
3373 case MP_CMD_BRIGHTNESS : {
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
3374 int v = cmd->args[0].v.i, abs = cmd->args[1].v.i;
6786
b16cb6cbff5a eq reworked
alex
parents: 6784
diff changeset
3375
b16cb6cbff5a eq reworked
alex
parents: 6784
diff changeset
3376 if (!sh_video)
b16cb6cbff5a eq reworked
alex
parents: 6784
diff changeset
3377 break;
b16cb6cbff5a eq reworked
alex
parents: 6784
diff changeset
3378
b16cb6cbff5a eq reworked
alex
parents: 6784
diff changeset
3379 if (vo_gamma_brightness == 1000)
b16cb6cbff5a eq reworked
alex
parents: 6784
diff changeset
3380 {
b16cb6cbff5a eq reworked
alex
parents: 6784
diff changeset
3381 vo_gamma_brightness = 0;
b16cb6cbff5a eq reworked
alex
parents: 6784
diff changeset
3382 get_video_colors(sh_video, "brightness", &vo_gamma_brightness);
b16cb6cbff5a eq reworked
alex
parents: 6784
diff changeset
3383 }
b16cb6cbff5a eq reworked
alex
parents: 6784
diff changeset
3384
6781
924263b4df10 eq reworked
alex
parents: 6755
diff changeset
3385 if (abs)
924263b4df10 eq reworked
alex
parents: 6755
diff changeset
3386 vo_gamma_brightness = v;
924263b4df10 eq reworked
alex
parents: 6755
diff changeset
3387 else
924263b4df10 eq reworked
alex
parents: 6755
diff changeset
3388 vo_gamma_brightness += v;
924263b4df10 eq reworked
alex
parents: 6755
diff changeset
3389
924263b4df10 eq reworked
alex
parents: 6755
diff changeset
3390 if (vo_gamma_brightness > 100)
924263b4df10 eq reworked
alex
parents: 6755
diff changeset
3391 vo_gamma_brightness = 100;
924263b4df10 eq reworked
alex
parents: 6755
diff changeset
3392 else if (vo_gamma_brightness < -100)
924263b4df10 eq reworked
alex
parents: 6755
diff changeset
3393 vo_gamma_brightness = -100;
16992
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
3394 if(set_video_colors(sh_video, "brightness", vo_gamma_brightness))
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
3395 set_osd_bar(OSD_BRIGHTNESS,"Brightness",-100,100,vo_gamma_brightness);
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
3396 } break;
6781
924263b4df10 eq reworked
alex
parents: 6755
diff changeset
3397 case MP_CMD_CONTRAST : {
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
3398 int v = cmd->args[0].v.i, abs = cmd->args[1].v.i;
6786
b16cb6cbff5a eq reworked
alex
parents: 6784
diff changeset
3399
b16cb6cbff5a eq reworked
alex
parents: 6784
diff changeset
3400 if (!sh_video)
b16cb6cbff5a eq reworked
alex
parents: 6784
diff changeset
3401 break;
b16cb6cbff5a eq reworked
alex
parents: 6784
diff changeset
3402
b16cb6cbff5a eq reworked
alex
parents: 6784
diff changeset
3403 if (vo_gamma_contrast == 1000)
b16cb6cbff5a eq reworked
alex
parents: 6784
diff changeset
3404 {
b16cb6cbff5a eq reworked
alex
parents: 6784
diff changeset
3405 vo_gamma_contrast = 0;
b16cb6cbff5a eq reworked
alex
parents: 6784
diff changeset
3406 get_video_colors(sh_video, "contrast", &vo_gamma_contrast);
b16cb6cbff5a eq reworked
alex
parents: 6784
diff changeset
3407 }
6781
924263b4df10 eq reworked
alex
parents: 6755
diff changeset
3408
924263b4df10 eq reworked
alex
parents: 6755
diff changeset
3409 if (abs)
924263b4df10 eq reworked
alex
parents: 6755
diff changeset
3410 vo_gamma_contrast = v;
924263b4df10 eq reworked
alex
parents: 6755
diff changeset
3411 else
924263b4df10 eq reworked
alex
parents: 6755
diff changeset
3412 vo_gamma_contrast += v;
924263b4df10 eq reworked
alex
parents: 6755
diff changeset
3413
924263b4df10 eq reworked
alex
parents: 6755
diff changeset
3414 if (vo_gamma_contrast > 100)
924263b4df10 eq reworked
alex
parents: 6755
diff changeset
3415 vo_gamma_contrast = 100;
924263b4df10 eq reworked
alex
parents: 6755
diff changeset
3416 else if (vo_gamma_contrast < -100)
924263b4df10 eq reworked
alex
parents: 6755
diff changeset
3417 vo_gamma_contrast = -100;
16992
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
3418 if(set_video_colors(sh_video, "contrast", vo_gamma_contrast))
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
3419 set_osd_bar(OSD_CONTRAST,"Contrast",-100,100,vo_gamma_contrast);
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
3420 } break;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
3421 case MP_CMD_SATURATION : {
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
3422 int v = cmd->args[0].v.i, abs = cmd->args[1].v.i;
6786
b16cb6cbff5a eq reworked
alex
parents: 6784
diff changeset
3423
b16cb6cbff5a eq reworked
alex
parents: 6784
diff changeset
3424 if (!sh_video)
b16cb6cbff5a eq reworked
alex
parents: 6784
diff changeset
3425 break;
b16cb6cbff5a eq reworked
alex
parents: 6784
diff changeset
3426
b16cb6cbff5a eq reworked
alex
parents: 6784
diff changeset
3427 if (vo_gamma_saturation == 1000)
b16cb6cbff5a eq reworked
alex
parents: 6784
diff changeset
3428 {
b16cb6cbff5a eq reworked
alex
parents: 6784
diff changeset
3429 vo_gamma_saturation = 0;
b16cb6cbff5a eq reworked
alex
parents: 6784
diff changeset
3430 get_video_colors(sh_video, "saturation", &vo_gamma_saturation);
b16cb6cbff5a eq reworked
alex
parents: 6784
diff changeset
3431 }
b16cb6cbff5a eq reworked
alex
parents: 6784
diff changeset
3432
6781
924263b4df10 eq reworked
alex
parents: 6755
diff changeset
3433 if (abs)
924263b4df10 eq reworked
alex
parents: 6755
diff changeset
3434 vo_gamma_saturation = v;
924263b4df10 eq reworked
alex
parents: 6755
diff changeset
3435 else
924263b4df10 eq reworked
alex
parents: 6755
diff changeset
3436 vo_gamma_saturation += v;
924263b4df10 eq reworked
alex
parents: 6755
diff changeset
3437
924263b4df10 eq reworked
alex
parents: 6755
diff changeset
3438 if (vo_gamma_saturation > 100)
924263b4df10 eq reworked
alex
parents: 6755
diff changeset
3439 vo_gamma_saturation = 100;
924263b4df10 eq reworked
alex
parents: 6755
diff changeset
3440 else if (vo_gamma_saturation < -100)
924263b4df10 eq reworked
alex
parents: 6755
diff changeset
3441 vo_gamma_saturation = -100;
16992
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
3442 if(set_video_colors(sh_video, "saturation", vo_gamma_saturation))
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
3443 set_osd_bar(OSD_SATURATION,"Saturation",-100,100,vo_gamma_saturation);
6781
924263b4df10 eq reworked
alex
parents: 6755
diff changeset
3444 } break;
924263b4df10 eq reworked
alex
parents: 6755
diff changeset
3445 case MP_CMD_HUE : {
924263b4df10 eq reworked
alex
parents: 6755
diff changeset
3446 int v = cmd->args[0].v.i, abs = cmd->args[1].v.i;
6786
b16cb6cbff5a eq reworked
alex
parents: 6784
diff changeset
3447
b16cb6cbff5a eq reworked
alex
parents: 6784
diff changeset
3448 if (!sh_video)
b16cb6cbff5a eq reworked
alex
parents: 6784
diff changeset
3449 break;
b16cb6cbff5a eq reworked
alex
parents: 6784
diff changeset
3450
b16cb6cbff5a eq reworked
alex
parents: 6784
diff changeset
3451 if (vo_gamma_hue == 1000)
b16cb6cbff5a eq reworked
alex
parents: 6784
diff changeset
3452 {
b16cb6cbff5a eq reworked
alex
parents: 6784
diff changeset
3453 vo_gamma_hue = 0;
b16cb6cbff5a eq reworked
alex
parents: 6784
diff changeset
3454 get_video_colors(sh_video, "hue", &vo_gamma_hue);
b16cb6cbff5a eq reworked
alex
parents: 6784
diff changeset
3455 }
6781
924263b4df10 eq reworked
alex
parents: 6755
diff changeset
3456
924263b4df10 eq reworked
alex
parents: 6755
diff changeset
3457 if (abs)
924263b4df10 eq reworked
alex
parents: 6755
diff changeset
3458 vo_gamma_hue = v;
924263b4df10 eq reworked
alex
parents: 6755
diff changeset
3459 else
924263b4df10 eq reworked
alex
parents: 6755
diff changeset
3460 vo_gamma_hue += v;
924263b4df10 eq reworked
alex
parents: 6755
diff changeset
3461
924263b4df10 eq reworked
alex
parents: 6755
diff changeset
3462 if (vo_gamma_hue > 100)
924263b4df10 eq reworked
alex
parents: 6755
diff changeset
3463 vo_gamma_hue = 100;
924263b4df10 eq reworked
alex
parents: 6755
diff changeset
3464 else if (vo_gamma_hue < -100)
924263b4df10 eq reworked
alex
parents: 6755
diff changeset
3465 vo_gamma_hue = -100;
16992
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
3466 if(set_video_colors(sh_video, "hue", vo_gamma_hue))
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
3467 set_osd_bar(OSD_HUE,"Hue",-100,100,vo_gamma_hue);
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
3468 } break;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
3469 case MP_CMD_FRAMEDROPPING : {
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
3470 int v = cmd->args[0].v.i;
16992
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
3471 if(v < 0)
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
3472 frame_dropping = (frame_dropping+1)%3;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
3473 else
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
3474 frame_dropping = v > 2 ? 2 : v;
16992
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
3475 set_osd_msg(OSD_MSG_FRAMEDROPPING,1,osd_duration,
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
3476 MSGTR_OSDFramedrop,(frame_dropping == 1 ? MSGTR_OSDFramedropOn :
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
3477 (frame_dropping == 2 ? MSGTR_OSDFramedropHard :
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
3478 MSGTR_OSDFramedropOff)));
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
3479 //vo_osd_changed(OSDTYPE_SUBTITLE);
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
3480 } break;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
3481 #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
3482 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
3483 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
3484 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
3485 } break;
141141fdd250 I'd like to change tv tuner frequency in the slave mode. So this patch
gabucino
parents: 10453
diff changeset
3486 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
3487 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
3488 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
3489 } break;
10577
7e5733a8c33b Hi, here are slave commands:
gabucino
parents: 10560
diff changeset
3490 case MP_CMD_TV_SET_BRIGHTNESS : {
7e5733a8c33b Hi, here are slave commands:
gabucino
parents: 10560
diff changeset
3491 if (file_format == DEMUXER_TYPE_TV)
7e5733a8c33b Hi, here are slave commands:
gabucino
parents: 10560
diff changeset
3492 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
3493 } break;
7e5733a8c33b Hi, here are slave commands:
gabucino
parents: 10560
diff changeset
3494 case MP_CMD_TV_SET_HUE : {
7e5733a8c33b Hi, here are slave commands:
gabucino
parents: 10560
diff changeset
3495 if (file_format == DEMUXER_TYPE_TV)
7e5733a8c33b Hi, here are slave commands:
gabucino
parents: 10560
diff changeset
3496 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
3497 } break;
7e5733a8c33b Hi, here are slave commands:
gabucino
parents: 10560
diff changeset
3498 case MP_CMD_TV_SET_SATURATION : {
7e5733a8c33b Hi, here are slave commands:
gabucino
parents: 10560
diff changeset
3499 if (file_format == DEMUXER_TYPE_TV)
7e5733a8c33b Hi, here are slave commands:
gabucino
parents: 10560
diff changeset
3500 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
3501 } break;
7e5733a8c33b Hi, here are slave commands:
gabucino
parents: 10560
diff changeset
3502 case MP_CMD_TV_SET_CONTRAST : {
7e5733a8c33b Hi, here are slave commands:
gabucino
parents: 10560
diff changeset
3503 if (file_format == DEMUXER_TYPE_TV)
7e5733a8c33b Hi, here are slave commands:
gabucino
parents: 10560
diff changeset
3504 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
3505 } break;
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
3506 case MP_CMD_TV_STEP_CHANNEL : {
9752
3db72324a0fe Stream cleanup, don't use blah_on options anymore.
albeu
parents: 9695
diff changeset
3507 if (file_format == DEMUXER_TYPE_TV) {
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
3508 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
3509 if(v > 0){
7419
alex
parents: 7329
diff changeset
3510 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
3511 } else {
7419
alex
parents: 7329
diff changeset
3512 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
3513 }
16992
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
3514 if (tv_channel_list) {
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
3515 set_osd_msg(OSD_MSG_TV_CHANNEL,1,osd_duration,
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
3516 MSGTR_OSDChannel, tv_channel_current->name);
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
3517 //vo_osd_changed(OSDTYPE_SUBTITLE);
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
3518 }
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
3519 }
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents: 9593
diff changeset
3520 }
76c6d8f1ebf5 this is a combo patch that:
arpi
parents: 9593
diff changeset
3521 #ifdef HAS_DVBIN_SUPPORT
10560
11826d9f90c7 this patch fixes
arpi
parents: 10557
diff changeset
3522 if((stream->type == STREAMTYPE_DVB) && stream->priv)
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents: 9593
diff changeset
3523 {
10560
11826d9f90c7 this patch fixes
arpi
parents: 10557
diff changeset
3524 dvb_priv_t *priv = (dvb_priv_t*) stream->priv;
11826d9f90c7 this patch fixes
arpi
parents: 10557
diff changeset
3525 if(priv->is_on)
11826d9f90c7 this patch fixes
arpi
parents: 10557
diff changeset
3526 {
11826d9f90c7 this patch fixes
arpi
parents: 10557
diff changeset
3527 int dir;
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents: 9593
diff changeset
3528 int v = cmd->args[0].v.i;
10708
a57e8d980652 This patch fixes:
alex
parents: 10707
diff changeset
3529
a57e8d980652 This patch fixes:
alex
parents: 10707
diff changeset
3530 last_dvb_step = v;
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents: 9593
diff changeset
3531 if(v > 0)
10560
11826d9f90c7 this patch fixes
arpi
parents: 10557
diff changeset
3532 dir = DVB_CHANNEL_HIGHER;
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents: 9593
diff changeset
3533 else
10560
11826d9f90c7 this patch fixes
arpi
parents: 10557
diff changeset
3534 dir = DVB_CHANNEL_LOWER;
11826d9f90c7 this patch fixes
arpi
parents: 10557
diff changeset
3535
11826d9f90c7 this patch fixes
arpi
parents: 10557
diff changeset
3536
11826d9f90c7 this patch fixes
arpi
parents: 10557
diff changeset
3537 if(dvb_step_channel(priv, dir))
11826d9f90c7 this patch fixes
arpi
parents: 10557
diff changeset
3538 {
10707
0d9ef9b4841c dvb channel changing vs input system (lirc) fix by David Kuehling <dvdkhlng@gmx.de>
alex
parents: 10691
diff changeset
3539 uninit_player(INITED_ALL-(INITED_STREAM|INITED_INPUT));
11352
d8b1f7509df2 Patch by Nico <nsabbi@libero.it>
attila
parents: 11331
diff changeset
3540 cache_uninit(stream);
d8b1f7509df2 Patch by Nico <nsabbi@libero.it>
attila
parents: 11331
diff changeset
3541 goto goto_enable_cache;
10560
11826d9f90c7 this patch fixes
arpi
parents: 10557
diff changeset
3542 }
11826d9f90c7 this patch fixes
arpi
parents: 10557
diff changeset
3543 }
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents: 9593
diff changeset
3544 }
16490
f17b3c152fd6 Add comments to a few #endif statements in order to make clear which
diego
parents: 16489
diff changeset
3545 #endif /* HAS_DVBIN_SUPPORT */
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents: 9593
diff changeset
3546 break;
8494
47cf94058137 add a TV_SET_CNANNEL command
henry
parents: 8467
diff changeset
3547 case MP_CMD_TV_SET_CHANNEL : {
9752
3db72324a0fe Stream cleanup, don't use blah_on options anymore.
albeu
parents: 9695
diff changeset
3548 if (file_format == DEMUXER_TYPE_TV) {
8494
47cf94058137 add a TV_SET_CNANNEL command
henry
parents: 8467
diff changeset
3549 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
3550 if (tv_channel_list) {
16992
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
3551 set_osd_msg(OSD_MSG_TV_CHANNEL,1,osd_duration,
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
3552 MSGTR_OSDChannel, tv_channel_current->name);
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
3553 //vo_osd_changed(OSDTYPE_SUBTITLE);
8627
14ab71b47a58 user friendly channel tuning + 10L fix in tvi_v4l (by Stephane Jourdois)
henry
parents: 8619
diff changeset
3554 }
14ab71b47a58 user friendly channel tuning + 10L fix in tvi_v4l (by Stephane Jourdois)
henry
parents: 8619
diff changeset
3555 }
14ab71b47a58 user friendly channel tuning + 10L fix in tvi_v4l (by Stephane Jourdois)
henry
parents: 8619
diff changeset
3556 } break;
10560
11826d9f90c7 this patch fixes
arpi
parents: 10557
diff changeset
3557 #ifdef HAS_DVBIN_SUPPORT
11826d9f90c7 this patch fixes
arpi
parents: 10557
diff changeset
3558 case MP_CMD_DVB_SET_CHANNEL:
11826d9f90c7 this patch fixes
arpi
parents: 10557
diff changeset
3559 {
11826d9f90c7 this patch fixes
arpi
parents: 10557
diff changeset
3560 if((stream->type == STREAMTYPE_DVB) && stream->priv)
11826d9f90c7 this patch fixes
arpi
parents: 10557
diff changeset
3561 {
11826d9f90c7 this patch fixes
arpi
parents: 10557
diff changeset
3562 dvb_priv_t *priv = (dvb_priv_t*) stream->priv;
11826d9f90c7 this patch fixes
arpi
parents: 10557
diff changeset
3563 if(priv->is_on)
11826d9f90c7 this patch fixes
arpi
parents: 10557
diff changeset
3564 {
10708
a57e8d980652 This patch fixes:
alex
parents: 10707
diff changeset
3565 if(priv->list->current <= cmd->args[0].v.i)
a57e8d980652 This patch fixes:
alex
parents: 10707
diff changeset
3566 last_dvb_step = 1;
a57e8d980652 This patch fixes:
alex
parents: 10707
diff changeset
3567 else
a57e8d980652 This patch fixes:
alex
parents: 10707
diff changeset
3568 last_dvb_step = -1;
a57e8d980652 This patch fixes:
alex
parents: 10707
diff changeset
3569
12306
661a6e80030f slave command dvb_set_channel now takes 2 arguments: channel card
nicodvb
parents: 12207
diff changeset
3570 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
3571 {
10707
0d9ef9b4841c dvb channel changing vs input system (lirc) fix by David Kuehling <dvdkhlng@gmx.de>
alex
parents: 10691
diff changeset
3572 uninit_player(INITED_ALL-(INITED_STREAM|INITED_INPUT));
11352
d8b1f7509df2 Patch by Nico <nsabbi@libero.it>
attila
parents: 11331
diff changeset
3573 cache_uninit(stream);
d8b1f7509df2 Patch by Nico <nsabbi@libero.it>
attila
parents: 11331
diff changeset
3574 goto goto_enable_cache;
10560
11826d9f90c7 this patch fixes
arpi
parents: 10557
diff changeset
3575 }
11826d9f90c7 this patch fixes
arpi
parents: 10557
diff changeset
3576 }
11826d9f90c7 this patch fixes
arpi
parents: 10557
diff changeset
3577 }
11826d9f90c7 this patch fixes
arpi
parents: 10557
diff changeset
3578 }
16490
f17b3c152fd6 Add comments to a few #endif statements in order to make clear which
diego
parents: 16489
diff changeset
3579 #endif /* HAS_DVBIN_SUPPORT */
8627
14ab71b47a58 user friendly channel tuning + 10L fix in tvi_v4l (by Stephane Jourdois)
henry
parents: 8619
diff changeset
3580 case MP_CMD_TV_LAST_CHANNEL : {
9752
3db72324a0fe Stream cleanup, don't use blah_on options anymore.
albeu
parents: 9695
diff changeset
3581 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
3582 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
3583 if (tv_channel_list) {
16992
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
3584 set_osd_msg(OSD_MSG_TV_CHANNEL,1,osd_duration,
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
3585 MSGTR_OSDChannel, tv_channel_current->name);
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
3586 //vo_osd_changed(OSDTYPE_SUBTITLE);
8627
14ab71b47a58 user friendly channel tuning + 10L fix in tvi_v4l (by Stephane Jourdois)
henry
parents: 8619
diff changeset
3587 }
14ab71b47a58 user friendly channel tuning + 10L fix in tvi_v4l (by Stephane Jourdois)
henry
parents: 8619
diff changeset
3588 }
8494
47cf94058137 add a TV_SET_CNANNEL command
henry
parents: 8467
diff changeset
3589 } break;
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
3590 case MP_CMD_TV_STEP_NORM : {
9752
3db72324a0fe Stream cleanup, don't use blah_on options anymore.
albeu
parents: 9695
diff changeset
3591 if (file_format == DEMUXER_TYPE_TV)
7419
alex
parents: 7329
diff changeset
3592 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
3593 } break;
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
3594 case MP_CMD_TV_STEP_CHANNEL_LIST : {
9752
3db72324a0fe Stream cleanup, don't use blah_on options anymore.
albeu
parents: 9695
diff changeset
3595 if (file_format == DEMUXER_TYPE_TV)
7419
alex
parents: 7329
diff changeset
3596 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
3597 } break;
16490
f17b3c152fd6 Add comments to a few #endif statements in order to make clear which
diego
parents: 16489
diff changeset
3598 #endif /* USE_TV */
13228
a47aaa6b7324 slave mode command to en/disable vsync, patch by Aurelien Jacobs <aurel at gnuage.org>
faust3
parents: 13168
diff changeset
3599 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
3600 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
3601 } break;
4733
5bad0d74f6ea standard key support for video out runtime fullscreen switching
alex
parents: 4693
diff changeset
3602 case MP_CMD_VO_FULLSCREEN:
5bad0d74f6ea standard key support for video out runtime fullscreen switching
alex
parents: 4693
diff changeset
3603 {
4858
65730cea02e7 add half new input support for gui
pontscho
parents: 4856
diff changeset
3604 #ifdef HAVE_NEW_GUI
65730cea02e7 add half new input support for gui
pontscho
parents: 4856
diff changeset
3605 if ( use_gui ) guiGetEvent( guiIEvent,(char *)MP_CMD_GUI_FULLSCREEN );
65730cea02e7 add half new input support for gui
pontscho
parents: 4856
diff changeset
3606 else
65730cea02e7 add half new input support for gui
pontscho
parents: 4856
diff changeset
3607 #endif
5511
7a24a067f0af vo_config_count now counts calls to vo->config()
arpi
parents: 5507
diff changeset
3608 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
3609 } break;
11542
85e503ddf65f runtime 'stay-on-top' functionality
joey
parents: 11352
diff changeset
3610 case MP_CMD_VO_ONTOP:
85e503ddf65f runtime 'stay-on-top' functionality
joey
parents: 11352
diff changeset
3611 {
85e503ddf65f runtime 'stay-on-top' functionality
joey
parents: 11352
diff changeset
3612 if(video_out && vo_config_count) {
85e503ddf65f runtime 'stay-on-top' functionality
joey
parents: 11352
diff changeset
3613 video_out->control(VOCTRL_ONTOP, 0);
16992
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
3614 set_osd_msg(OSD_MSG_ONTOP,1,osd_duration,
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
3615 MSGTR_OSDStayOnTop, vo_ontop? MSGTR_OSDenabled : MSGTR_OSDdisabled);
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
3616 //vo_osd_changed(OSDTYPE_SUBTITLE);
11542
85e503ddf65f runtime 'stay-on-top' functionality
joey
parents: 11352
diff changeset
3617 }
85e503ddf65f runtime 'stay-on-top' functionality
joey
parents: 11352
diff changeset
3618
85e503ddf65f runtime 'stay-on-top' functionality
joey
parents: 11352
diff changeset
3619 } break;
13091
25f51c72eb06 added runtime toggle of root window playback
joey
parents: 13089
diff changeset
3620 case MP_CMD_VO_ROOTWIN:
25f51c72eb06 added runtime toggle of root window playback
joey
parents: 13089
diff changeset
3621 {
25f51c72eb06 added runtime toggle of root window playback
joey
parents: 13089
diff changeset
3622 if(video_out && vo_config_count) {
25f51c72eb06 added runtime toggle of root window playback
joey
parents: 13089
diff changeset
3623 video_out->control(VOCTRL_ROOTWIN, 0);
16992
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
3624 set_osd_msg(OSD_MSG_ROOTWIN,1,osd_duration,
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
3625 MSGTR_OSDRootwin, vo_rootwin? MSGTR_OSDenabled : MSGTR_OSDdisabled);
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
3626 //vo_osd_changed(OSDTYPE_SUBTITLE);
13091
25f51c72eb06 added runtime toggle of root window playback
joey
parents: 13089
diff changeset
3627 }
25f51c72eb06 added runtime toggle of root window playback
joey
parents: 13089
diff changeset
3628
25f51c72eb06 added runtime toggle of root window playback
joey
parents: 13089
diff changeset
3629 } break;
16968
e9d849bf8050 add a switch, slave command, and vo control to toggle borderless window.
joey
parents: 16955
diff changeset
3630 case MP_CMD_VO_BORDER:
e9d849bf8050 add a switch, slave command, and vo control to toggle borderless window.
joey
parents: 16955
diff changeset
3631 {
e9d849bf8050 add a switch, slave command, and vo control to toggle borderless window.
joey
parents: 16955
diff changeset
3632 if(video_out && vo_config_count) {
e9d849bf8050 add a switch, slave command, and vo control to toggle borderless window.
joey
parents: 16955
diff changeset
3633 video_out->control(VOCTRL_BORDER, 0);
16992
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
3634 set_osd_msg(OSD_MSG_BORDER,1,osd_duration,
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
3635 MSGTR_OSDBorder, vo_border? MSGTR_OSDenabled : MSGTR_OSDdisabled);
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
3636 //vo_osd_changed(OSDTYPE_SUBTITLE);
16968
e9d849bf8050 add a switch, slave command, and vo control to toggle borderless window.
joey
parents: 16955
diff changeset
3637 }
e9d849bf8050 add a switch, slave command, and vo control to toggle borderless window.
joey
parents: 16955
diff changeset
3638
e9d849bf8050 add a switch, slave command, and vo control to toggle borderless window.
joey
parents: 16955
diff changeset
3639 } break;
6304
ee65527096c2 pan&scan support with -vo xv by ?? <mplayer@svennevid.net>
arpi
parents: 6280
diff changeset
3640 case MP_CMD_PANSCAN : {
6311
da2dda48b7ec add mute support ( step 1 ) and fixed panscan bugs (1000l for me)
pontscho
parents: 6307
diff changeset
3641 if ( !video_out ) break;
6307
72c87b2ec779 added panscan support for xmga/xvidix
pontscho
parents: 6304
diff changeset
3642 if ( video_out->control( VOCTRL_GET_PANSCAN,NULL ) == VO_TRUE )
72c87b2ec779 added panscan support for xmga/xvidix
pontscho
parents: 6304
diff changeset
3643 {
72c87b2ec779 added panscan support for xmga/xvidix
pontscho
parents: 6304
diff changeset
3644 int abs= cmd->args[1].v.i;
72c87b2ec779 added panscan support for xmga/xvidix
pontscho
parents: 6304
diff changeset
3645 float v = cmd->args[0].v.f;
72c87b2ec779 added panscan support for xmga/xvidix
pontscho
parents: 6304
diff changeset
3646 float res;
72c87b2ec779 added panscan support for xmga/xvidix
pontscho
parents: 6304
diff changeset
3647 if(abs) res = v;
72c87b2ec779 added panscan support for xmga/xvidix
pontscho
parents: 6304
diff changeset
3648 else res = vo_panscan+v;
72c87b2ec779 added panscan support for xmga/xvidix
pontscho
parents: 6304
diff changeset
3649 vo_panscan = res > 1 ? 1 : res < 0 ? 0 : res;
72c87b2ec779 added panscan support for xmga/xvidix
pontscho
parents: 6304
diff changeset
3650 video_out->control( VOCTRL_SET_PANSCAN,NULL );
16992
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
3651 set_osd_bar(OSD_PANSCAN,"Panscan",0,1,vo_panscan);
6307
72c87b2ec779 added panscan support for xmga/xvidix
pontscho
parents: 6304
diff changeset
3652 }
6304
ee65527096c2 pan&scan support with -vo xv by ?? <mplayer@svennevid.net>
arpi
parents: 6280
diff changeset
3653 } break;
5015
9842148f6053 -subpos key bindings with new input layer - patch by Tomas Konir <moje@molly.vabo.cz>
arpi
parents: 4981
diff changeset
3654 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
3655 {
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
3656 #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
3657 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
3658 int v;
9842148f6053 -subpos key bindings with new input layer - patch by Tomas Konir <moje@molly.vabo.cz>
arpi
parents: 4981
diff changeset
3659 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
3660
9842148f6053 -subpos key bindings with new input layer - patch by Tomas Konir <moje@molly.vabo.cz>
arpi
parents: 4981
diff changeset
3661 sub_pos+=v;
9842148f6053 -subpos key bindings with new input layer - patch by Tomas Konir <moje@molly.vabo.cz>
arpi
parents: 4981
diff changeset
3662 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
3663 if(sub_pos <0) sub_pos=0;
16992
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
3664 set_osd_msg(OSD_MSG_SUB_POS,1,osd_duration,
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
3665 MSGTR_OSDSubPosition, sub_pos);
5640
a0cee3bb7f78 osd: calculating bbox
arpi
parents: 5638
diff changeset
3666 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
3667 }
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
3668 #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
3669 } break;
8534
922ce27eb683 This patch adds support for vertical subtitle alignment
arpi
parents: 8531
diff changeset
3670 case MP_CMD_SUB_ALIGNMENT:
922ce27eb683 This patch adds support for vertical subtitle alignment
arpi
parents: 8531
diff changeset
3671 {
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
3672 #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
3673 if (sh_video) {
8534
922ce27eb683 This patch adds support for vertical subtitle alignment
arpi
parents: 8531
diff changeset
3674 if (cmd->nargs >= 1)
922ce27eb683 This patch adds support for vertical subtitle alignment
arpi
parents: 8531
diff changeset
3675 sub_alignment = cmd->args[0].v.i;
922ce27eb683 This patch adds support for vertical subtitle alignment
arpi
parents: 8531
diff changeset
3676 else
922ce27eb683 This patch adds support for vertical subtitle alignment
arpi
parents: 8531
diff changeset
3677 sub_alignment = (sub_alignment+1) % 3;
16992
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
3678 set_osd_msg(OSD_MSG_SUB_ALIGN,1,osd_duration,
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
3679 MSGTR_OSDSubAlignment,(sub_alignment == 2 ? MSGTR_OSDSubBottom :
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
3680 (sub_alignment == 1 ? MSGTR_OSDSubCenter : MSGTR_OSDSubTop)));
8534
922ce27eb683 This patch adds support for vertical subtitle alignment
arpi
parents: 8531
diff changeset
3681 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
3682 }
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
3683 #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
3684 } break;
7628
d6608342591d This patch adds the functionality to disable/enable subtitles while playing
arpi
parents: 7621
diff changeset
3685 case MP_CMD_SUB_VISIBILITY:
d6608342591d This patch adds the functionality to disable/enable subtitles while playing
arpi
parents: 7621
diff changeset
3686 {
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
3687 #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
3688 if (sh_video) {
7628
d6608342591d This patch adds the functionality to disable/enable subtitles while playing
arpi
parents: 7621
diff changeset
3689 sub_visibility=1-sub_visibility;
16992
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
3690 set_osd_msg(OSD_MSG_SUB_VISIBLE,1,osd_duration,
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
3691 MSGTR_OSDSubtitles, sub_visibility?MSGTR_OSDenabled:MSGTR_OSDdisabled);
7628
d6608342591d This patch adds the functionality to disable/enable subtitles while playing
arpi
parents: 7621
diff changeset
3692 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
3693 }
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
3694 #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
3695 } break;
15706
c6bedab03c97 Add sub_load and sub_remove slave commands.
reimar
parents: 15603
diff changeset
3696 case MP_CMD_SUB_LOAD:
c6bedab03c97 Add sub_load and sub_remove slave commands.
reimar
parents: 15603
diff changeset
3697 {
c6bedab03c97 Add sub_load and sub_remove slave commands.
reimar
parents: 15603
diff changeset
3698 #ifdef USE_SUB
c6bedab03c97 Add sub_load and sub_remove slave commands.
reimar
parents: 15603
diff changeset
3699 if (sh_video) {
c6bedab03c97 Add sub_load and sub_remove slave commands.
reimar
parents: 15603
diff changeset
3700 int n = set_of_sub_size;
c6bedab03c97 Add sub_load and sub_remove slave commands.
reimar
parents: 15603
diff changeset
3701 add_subtitles(cmd->args[0].v.s, sh_video->fps, 0);
c6bedab03c97 Add sub_load and sub_remove slave commands.
reimar
parents: 15603
diff changeset
3702 if (n != set_of_sub_size) {
c6bedab03c97 Add sub_load and sub_remove slave commands.
reimar
parents: 15603
diff changeset
3703 if (global_sub_indices[SUB_SOURCE_SUBS] < 0)
c6bedab03c97 Add sub_load and sub_remove slave commands.
reimar
parents: 15603
diff changeset
3704 global_sub_indices[SUB_SOURCE_SUBS] = global_sub_size;
c6bedab03c97 Add sub_load and sub_remove slave commands.
reimar
parents: 15603
diff changeset
3705 ++global_sub_size;
c6bedab03c97 Add sub_load and sub_remove slave commands.
reimar
parents: 15603
diff changeset
3706 }
c6bedab03c97 Add sub_load and sub_remove slave commands.
reimar
parents: 15603
diff changeset
3707 }
c6bedab03c97 Add sub_load and sub_remove slave commands.
reimar
parents: 15603
diff changeset
3708 #endif
c6bedab03c97 Add sub_load and sub_remove slave commands.
reimar
parents: 15603
diff changeset
3709 } break;
c6bedab03c97 Add sub_load and sub_remove slave commands.
reimar
parents: 15603
diff changeset
3710 case MP_CMD_SUB_REMOVE:
c6bedab03c97 Add sub_load and sub_remove slave commands.
reimar
parents: 15603
diff changeset
3711 {
c6bedab03c97 Add sub_load and sub_remove slave commands.
reimar
parents: 15603
diff changeset
3712 #ifdef USE_SUB
c6bedab03c97 Add sub_load and sub_remove slave commands.
reimar
parents: 15603
diff changeset
3713 if (sh_video) {
c6bedab03c97 Add sub_load and sub_remove slave commands.
reimar
parents: 15603
diff changeset
3714 int v = cmd->args[0].v.i;
c6bedab03c97 Add sub_load and sub_remove slave commands.
reimar
parents: 15603
diff changeset
3715 sub_data *subd;
c6bedab03c97 Add sub_load and sub_remove slave commands.
reimar
parents: 15603
diff changeset
3716 if (v < 0) {
c6bedab03c97 Add sub_load and sub_remove slave commands.
reimar
parents: 15603
diff changeset
3717 for (v = 0; v < set_of_sub_size; ++v) {
c6bedab03c97 Add sub_load and sub_remove slave commands.
reimar
parents: 15603
diff changeset
3718 subd = set_of_subtitles[v];
c6bedab03c97 Add sub_load and sub_remove slave commands.
reimar
parents: 15603
diff changeset
3719 mp_msg(MSGT_CPLAYER, MSGL_STATUS, MSGTR_RemovedSubtitleFile, v + 1, subd->filename);
c6bedab03c97 Add sub_load and sub_remove slave commands.
reimar
parents: 15603
diff changeset
3720 sub_free(subd);
c6bedab03c97 Add sub_load and sub_remove slave commands.
reimar
parents: 15603
diff changeset
3721 set_of_subtitles[v] = NULL;
c6bedab03c97 Add sub_load and sub_remove slave commands.
reimar
parents: 15603
diff changeset
3722 }
c6bedab03c97 Add sub_load and sub_remove slave commands.
reimar
parents: 15603
diff changeset
3723 global_sub_indices[SUB_SOURCE_SUBS] = -1;
c6bedab03c97 Add sub_load and sub_remove slave commands.
reimar
parents: 15603
diff changeset
3724 global_sub_size -= set_of_sub_size;
c6bedab03c97 Add sub_load and sub_remove slave commands.
reimar
parents: 15603
diff changeset
3725 set_of_sub_size = 0;
c6bedab03c97 Add sub_load and sub_remove slave commands.
reimar
parents: 15603
diff changeset
3726 if (set_of_sub_pos >= 0) {
c6bedab03c97 Add sub_load and sub_remove slave commands.
reimar
parents: 15603
diff changeset
3727 global_sub_pos = -2;
c6bedab03c97 Add sub_load and sub_remove slave commands.
reimar
parents: 15603
diff changeset
3728 vo_sub_last = vo_sub = NULL;
c6bedab03c97 Add sub_load and sub_remove slave commands.
reimar
parents: 15603
diff changeset
3729 vo_osd_changed(OSDTYPE_SUBTITLE);
c6bedab03c97 Add sub_load and sub_remove slave commands.
reimar
parents: 15603
diff changeset
3730 vo_update_osd(sh_video->disp_w, sh_video->disp_h);
c6bedab03c97 Add sub_load and sub_remove slave commands.
reimar
parents: 15603
diff changeset
3731 mp_input_queue_cmd(mp_input_parse_cmd("sub_select"));
c6bedab03c97 Add sub_load and sub_remove slave commands.
reimar
parents: 15603
diff changeset
3732 }
c6bedab03c97 Add sub_load and sub_remove slave commands.
reimar
parents: 15603
diff changeset
3733 }
c6bedab03c97 Add sub_load and sub_remove slave commands.
reimar
parents: 15603
diff changeset
3734 else if (v < set_of_sub_size) {
c6bedab03c97 Add sub_load and sub_remove slave commands.
reimar
parents: 15603
diff changeset
3735 subd = set_of_subtitles[v];
c6bedab03c97 Add sub_load and sub_remove slave commands.
reimar
parents: 15603
diff changeset
3736 mp_msg(MSGT_CPLAYER, MSGL_STATUS, MSGTR_RemovedSubtitleFile, v + 1, subd->filename);
c6bedab03c97 Add sub_load and sub_remove slave commands.
reimar
parents: 15603
diff changeset
3737 sub_free(subd);
c6bedab03c97 Add sub_load and sub_remove slave commands.
reimar
parents: 15603
diff changeset
3738 if (set_of_sub_pos == v) {
c6bedab03c97 Add sub_load and sub_remove slave commands.
reimar
parents: 15603
diff changeset
3739 global_sub_pos = -2;
c6bedab03c97 Add sub_load and sub_remove slave commands.
reimar
parents: 15603
diff changeset
3740 vo_sub_last = vo_sub = NULL;
c6bedab03c97 Add sub_load and sub_remove slave commands.
reimar
parents: 15603
diff changeset
3741 vo_osd_changed(OSDTYPE_SUBTITLE);
c6bedab03c97 Add sub_load and sub_remove slave commands.
reimar
parents: 15603
diff changeset
3742 vo_update_osd(sh_video->disp_w, sh_video->disp_h);
c6bedab03c97 Add sub_load and sub_remove slave commands.
reimar
parents: 15603
diff changeset
3743 mp_input_queue_cmd(mp_input_parse_cmd("sub_select"));
c6bedab03c97 Add sub_load and sub_remove slave commands.
reimar
parents: 15603
diff changeset
3744 }
c6bedab03c97 Add sub_load and sub_remove slave commands.
reimar
parents: 15603
diff changeset
3745 else if (set_of_sub_pos > v) {
c6bedab03c97 Add sub_load and sub_remove slave commands.
reimar
parents: 15603
diff changeset
3746 --set_of_sub_pos;
c6bedab03c97 Add sub_load and sub_remove slave commands.
reimar
parents: 15603
diff changeset
3747 --global_sub_pos;
c6bedab03c97 Add sub_load and sub_remove slave commands.
reimar
parents: 15603
diff changeset
3748 }
c6bedab03c97 Add sub_load and sub_remove slave commands.
reimar
parents: 15603
diff changeset
3749 while (++v < set_of_sub_size)
c6bedab03c97 Add sub_load and sub_remove slave commands.
reimar
parents: 15603
diff changeset
3750 set_of_subtitles[v - 1] = set_of_subtitles[v];
c6bedab03c97 Add sub_load and sub_remove slave commands.
reimar
parents: 15603
diff changeset
3751 --set_of_sub_size;
c6bedab03c97 Add sub_load and sub_remove slave commands.
reimar
parents: 15603
diff changeset
3752 --global_sub_size;
c6bedab03c97 Add sub_load and sub_remove slave commands.
reimar
parents: 15603
diff changeset
3753 if (set_of_sub_size <= 0)
c6bedab03c97 Add sub_load and sub_remove slave commands.
reimar
parents: 15603
diff changeset
3754 global_sub_indices[SUB_SOURCE_SUBS] = -1;
c6bedab03c97 Add sub_load and sub_remove slave commands.
reimar
parents: 15603
diff changeset
3755 set_of_subtitles[set_of_sub_size] = NULL;
c6bedab03c97 Add sub_load and sub_remove slave commands.
reimar
parents: 15603
diff changeset
3756 }
c6bedab03c97 Add sub_load and sub_remove slave commands.
reimar
parents: 15603
diff changeset
3757 }
16490
f17b3c152fd6 Add comments to a few #endif statements in order to make clear which
diego
parents: 16489
diff changeset
3758 #endif /* USE_SUB */
15706
c6bedab03c97 Add sub_load and sub_remove slave commands.
reimar
parents: 15603
diff changeset
3759 } 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
3760 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
3761 {
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
3762 #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
3763 if (sh_video) {
16079
96d10b705bc6 Remove untranslatable strings
wight
parents: 16049
diff changeset
3764 mp_msg(MSGT_GLOBAL,MSGL_INFO, "ANS_SUB_VISIBILITY=%ld\n", 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
3765 }
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
3766 #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
3767 } break;
12841
96b807836eca individual sub_select option not interferring with vobsub_lang
alex
parents: 12835
diff changeset
3768 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
3769 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
3770 int source = -1;
15128
96512bcb2eca allow sub_select and vobsub_lang to select particular subtitle
henry
parents: 15079
diff changeset
3771 int v = cmd->args[0].v.i;
96512bcb2eca allow sub_select and vobsub_lang to select particular subtitle
henry
parents: 15079
diff changeset
3772
96512bcb2eca allow sub_select and vobsub_lang to select particular subtitle
henry
parents: 15079
diff changeset
3773 if (v < -1)
96512bcb2eca allow sub_select and vobsub_lang to select particular subtitle
henry
parents: 15079
diff changeset
3774 global_sub_pos++;
96512bcb2eca allow sub_select and vobsub_lang to select particular subtitle
henry
parents: 15079
diff changeset
3775 else
96512bcb2eca allow sub_select and vobsub_lang to select particular subtitle
henry
parents: 15079
diff changeset
3776 global_sub_pos = v;
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
3777 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
3778 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
3779 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
3780 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
3781
a5004eb92a79 fix sub_select fiasco with global sub numbering. now multiple sub sources can be managed in essentially one list.
joey
parents: 13500
diff changeset
3782 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
3783 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
3784 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
3785 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
3786
a5004eb92a79 fix sub_select fiasco with global sub numbering. now multiple sub sources can be managed in essentially one list.
joey
parents: 13500
diff changeset
3787 #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
3788 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
3789 subdata = NULL;
14684
a4767edef10d command to log current subtitle to file
henry
parents: 14644
diff changeset
3790 vo_sub_last = vo_sub = NULL;
9870
09d630a4f991 support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents: 9831
diff changeset
3791 #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
3792 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
3793 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
3794 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
3795
a5004eb92a79 fix sub_select fiasco with global sub numbering. now multiple sub sources can be managed in essentially one list.
joey
parents: 13500
diff changeset
3796 // 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
3797 // 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
3798 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
3799 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
3800
a5004eb92a79 fix sub_select fiasco with global sub numbering. now multiple sub sources can be managed in essentially one list.
joey
parents: 13500
diff changeset
3801 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
3802 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
3803 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
3804 #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
3805 } 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
3806 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
3807 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
3808 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
3809 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
3810
a5004eb92a79 fix sub_select fiasco with global sub numbering. now multiple sub sources can be managed in essentially one list.
joey
parents: 13500
diff changeset
3811 // FIXME: is this the correct place for these?
16740
e168c0704cfc change to switch/case for dumpsub
ods15
parents: 16730
diff changeset
3812 switch (stream_dump_type) {
e168c0704cfc change to switch/case for dumpsub
ods15
parents: 16730
diff changeset
3813 case 3: list_sub_file(subdata); break;
e168c0704cfc change to switch/case for dumpsub
ods15
parents: 16730
diff changeset
3814 case 4: dump_mpsub(subdata, sh_video->fps); break;
e168c0704cfc change to switch/case for dumpsub
ods15
parents: 16730
diff changeset
3815 case 6: dump_srt(subdata, sh_video->fps); break;
e168c0704cfc change to switch/case for dumpsub
ods15
parents: 16730
diff changeset
3816 case 7: dump_microdvd(subdata, sh_video->fps); break;
e168c0704cfc change to switch/case for dumpsub
ods15
parents: 16730
diff changeset
3817 case 8: dump_jacosub(subdata, sh_video->fps); break;
e168c0704cfc change to switch/case for dumpsub
ods15
parents: 16730
diff changeset
3818 case 9: dump_sami(subdata, sh_video->fps); break;
e168c0704cfc change to switch/case for dumpsub
ods15
parents: 16730
diff changeset
3819 }
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
3820 #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
3821 } 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
3822 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
3823 if (d_dvdsub) {
13092
36701f60f093 forgot some ifdef's and broke mplayer.c without ogg & dvdread
joey
parents: 13091
diff changeset
3824 #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
3825 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
3826 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
3827 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
3828 }
13092
36701f60f093 forgot some ifdef's and broke mplayer.c without ogg & dvdread
joey
parents: 13091
diff changeset
3829 #endif
36701f60f093 forgot some ifdef's and broke mplayer.c without ogg & dvdread
joey
parents: 13091
diff changeset
3830 #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
3831 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
3832 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
3833 #endif
13126
b59e16a8dfc7 Support for subtitle switching in Matroska.
mosu
parents: 13122
diff changeset
3834 #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
3835 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
3836 d_dvdsub->id = demux_mkv_change_subs(demuxer, dvdsub_id);
13126
b59e16a8dfc7 Support for subtitle switching in Matroska.
mosu
parents: 13122
diff changeset
3837 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
3838 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
3839 if (vo_spudec != NULL)
b59e16a8dfc7 Support for subtitle switching in Matroska.
mosu
parents: 13122
diff changeset
3840 spudec_free(vo_spudec);
b59e16a8dfc7 Support for subtitle switching in Matroska.
mosu
parents: 13122
diff changeset
3841 vo_spudec =
14561
a226d301eec1 Handle missing palettes in the info part of VobSubs in Matroska files correctly by giving mplayer a NULL pointer. This way it will use a default palette instead of black only. Patch by Csillag Kristof (fenwick () freemail ! hu)
mosu
parents: 14530
diff changeset
3842 spudec_new_scaled_vobsub(mkv_sh_sub->has_palette ? mkv_sh_sub->palette : NULL, mkv_sh_sub->colors,
13126
b59e16a8dfc7 Support for subtitle switching in Matroska.
mosu
parents: 13122
diff changeset
3843 mkv_sh_sub->custom_colors,
b59e16a8dfc7 Support for subtitle switching in Matroska.
mosu
parents: 13122
diff changeset
3844 mkv_sh_sub->width,
b59e16a8dfc7 Support for subtitle switching in Matroska.
mosu
parents: 13122
diff changeset
3845 mkv_sh_sub->height);
b59e16a8dfc7 Support for subtitle switching in Matroska.
mosu
parents: 13122
diff changeset
3846 if (!forced_subs_only)
b59e16a8dfc7 Support for subtitle switching in Matroska.
mosu
parents: 13122
diff changeset
3847 forced_subs_only = mkv_sh_sub->forced_subs_only;
b59e16a8dfc7 Support for subtitle switching in Matroska.
mosu
parents: 13122
diff changeset
3848 if (vo_spudec) {
b59e16a8dfc7 Support for subtitle switching in Matroska.
mosu
parents: 13122
diff changeset
3849 spudec_set_forced_subs_only(vo_spudec, forced_subs_only);
b59e16a8dfc7 Support for subtitle switching in Matroska.
mosu
parents: 13122
diff changeset
3850 inited_flags |= INITED_SPUDEC;
b59e16a8dfc7 Support for subtitle switching in Matroska.
mosu
parents: 13122
diff changeset
3851 }
b59e16a8dfc7 Support for subtitle switching in Matroska.
mosu
parents: 13122
diff changeset
3852 }
b59e16a8dfc7 Support for subtitle switching in Matroska.
mosu
parents: 13122
diff changeset
3853 }
b59e16a8dfc7 Support for subtitle switching in Matroska.
mosu
parents: 13122
diff changeset
3854 #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
3855 }
a5004eb92a79 fix sub_select fiasco with global sub numbering. now multiple sub sources can be managed in essentially one list.
joey
parents: 13500
diff changeset
3856 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
3857 } 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
3858 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
3859 #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
3860 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
3861 #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
3862 }
a5004eb92a79 fix sub_select fiasco with global sub numbering. now multiple sub sources can be managed in essentially one list.
joey
parents: 13500
diff changeset
3863 // 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
3864 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
3865 }
9870
09d630a4f991 support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents: 9831
diff changeset
3866 break;
10917
d45870f67728 Forced subtitles patch by Arne Driescher <driescher@mpi-magdeburg.mpg.de>
attila
parents: 10884
diff changeset
3867 case MP_CMD_SUB_FORCED_ONLY:
d45870f67728 Forced subtitles patch by Arne Driescher <driescher@mpi-magdeburg.mpg.de>
attila
parents: 10884
diff changeset
3868 if (vo_spudec) {
d45870f67728 Forced subtitles patch by Arne Driescher <driescher@mpi-magdeburg.mpg.de>
attila
parents: 10884
diff changeset
3869 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
3870 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
3871 }
d45870f67728 Forced subtitles patch by Arne Driescher <driescher@mpi-magdeburg.mpg.de>
attila
parents: 10884
diff changeset
3872 break;
6112
69b3c25728fb Add the forgoten scrennshot command
albeu
parents: 6110
diff changeset
3873 case MP_CMD_SCREENSHOT :
16446
c82c0d407ec9 screenshot filter
henry
parents: 16402
diff changeset
3874 if(vo_config_count){
c82c0d407ec9 screenshot filter
henry
parents: 16402
diff changeset
3875 mp_msg(MSGT_CPLAYER,MSGL_INFO,"sending VFCTRL_SCREENSHOT!\n");
c82c0d407ec9 screenshot filter
henry
parents: 16402
diff changeset
3876 if(CONTROL_OK!=((vf_instance_t *)sh_video->vfilter)->control(sh_video->vfilter, VFCTRL_SCREENSHOT, 0))
c82c0d407ec9 screenshot filter
henry
parents: 16402
diff changeset
3877 video_out->control(VOCTRL_SCREENSHOT, NULL);
c82c0d407ec9 screenshot filter
henry
parents: 16402
diff changeset
3878 }
6112
69b3c25728fb Add the forgoten scrennshot command
albeu
parents: 6110
diff changeset
3879 break;
6888
2dde1a1bc03a Add the input command "change_rectangle" to control the rectangle
kmkaplan
parents: 6871
diff changeset
3880 case MP_CMD_VF_CHANGE_RECTANGLE:
2dde1a1bc03a Add the input command "change_rectangle" to control the rectangle
kmkaplan
parents: 6871
diff changeset
3881 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
3882 break;
8364
137b7574c85f slave-mode commands to get movie length & pos
arpi
parents: 8363
diff changeset
3883
137b7574c85f slave-mode commands to get movie length & pos
arpi
parents: 8363
diff changeset
3884 case MP_CMD_GET_TIME_LENGTH : {
16346
6ff303d2876b Make -identify's 'ID_LENGTH=' print a float and not an integer.. The
ods15
parents: 16345
diff changeset
3885 mp_msg(MSGT_GLOBAL,MSGL_INFO, "ANS_LENGTH=%.2lf\n", demuxer_get_time_length(demuxer));
8364
137b7574c85f slave-mode commands to get movie length & pos
arpi
parents: 8363
diff changeset
3886 } break;
137b7574c85f slave-mode commands to get movie length & pos
arpi
parents: 8363
diff changeset
3887
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
3888 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
3889 if(video_out && vo_config_count)
16079
96d10b705bc6 Remove untranslatable strings
wight
parents: 16049
diff changeset
3890 mp_msg(MSGT_GLOBAL,MSGL_INFO, "ANS_VO_FULLSCREEN=%ld\n", 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
3891 } 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
3892
8364
137b7574c85f slave-mode commands to get movie length & pos
arpi
parents: 8363
diff changeset
3893 case MP_CMD_GET_PERCENT_POS : {
16079
96d10b705bc6 Remove untranslatable strings
wight
parents: 16049
diff changeset
3894 mp_msg(MSGT_GLOBAL,MSGL_INFO, "ANS_PERCENT_POSITION=%ld\n", demuxer_get_percent_pos(demuxer));
8364
137b7574c85f slave-mode commands to get movie length & pos
arpi
parents: 8363
diff changeset
3895 } break;
15504
cec4a515061f new get_time_pos slave mode commando
reimar
parents: 15288
diff changeset
3896 case MP_CMD_GET_TIME_POS : {
cec4a515061f new get_time_pos slave mode commando
reimar
parents: 15288
diff changeset
3897 float pos = 0;
cec4a515061f new get_time_pos slave mode commando
reimar
parents: 15288
diff changeset
3898 if (sh_video)
cec4a515061f new get_time_pos slave mode commando
reimar
parents: 15288
diff changeset
3899 pos = sh_video->pts;
cec4a515061f new get_time_pos slave mode commando
reimar
parents: 15288
diff changeset
3900 else
cec4a515061f new get_time_pos slave mode commando
reimar
parents: 15288
diff changeset
3901 if (sh_audio && audio_out)
cec4a515061f new get_time_pos slave mode commando
reimar
parents: 15288
diff changeset
3902 pos = sh_audio->delay - audio_out->get_delay() * playback_speed;
16079
96d10b705bc6 Remove untranslatable strings
wight
parents: 16049
diff changeset
3903 mp_msg(MSGT_GLOBAL, MSGL_INFO, "ANS_TIME_POSITION=%.1f\n", pos);
15504
cec4a515061f new get_time_pos slave mode commando
reimar
parents: 15288
diff changeset
3904 } break;
15285
39eb8a327ea9 adds a parameter to the switch_audio command to directly select a track.
reimar
parents: 15241
diff changeset
3905 case MP_CMD_SWITCH_AUDIO : {
39eb8a327ea9 adds a parameter to the switch_audio command to directly select a track.
reimar
parents: 15241
diff changeset
3906 int v = demuxer_switch_audio(demuxer, cmd->args[0].v.i);
39eb8a327ea9 adds a parameter to the switch_audio command to directly select a track.
reimar
parents: 15241
diff changeset
3907 if (identify)
39eb8a327ea9 adds a parameter to the switch_audio command to directly select a track.
reimar
parents: 15241
diff changeset
3908 mp_msg(MSGT_GLOBAL, MSGL_INFO, "ID_AUDIO_TRACK=%d\n", v);
39eb8a327ea9 adds a parameter to the switch_audio command to directly select a track.
reimar
parents: 15241
diff changeset
3909 } break;
14087
26937d8c5c9e enable the run slave commande even without libmenu
aurel
parents: 14077
diff changeset
3910 case MP_CMD_RUN : {
13353
65207324b932 make it possible to use the run command from a menu config file, based on a patch by Aurelien Jacobs <aurel@gnuage.org>
faust3
parents: 13341
diff changeset
3911 #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
3912 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
3913 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
3914 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
3915 }
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
3916 #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
3917 } break;
16323
60c6693b2b2b add key_down_eventto slave mode, used to inject key down event with mplayer_put_key
nplourde
parents: 16315
diff changeset
3918 case MP_CMD_KEYDOWN_EVENTS : {
60c6693b2b2b add key_down_eventto slave mode, used to inject key down event with mplayer_put_key
nplourde
parents: 16315
diff changeset
3919 mplayer_put_key(cmd->args[0].v.i);
60c6693b2b2b add key_down_eventto slave mode, used to inject key down event with mplayer_put_key
nplourde
parents: 16315
diff changeset
3920 } break;
5380
8a01cde9cf39 DVDnav support patch by David Holm and Kees Cook <mplayer@outflux.net>
arpi
parents: 5367
diff changeset
3921 #ifdef USE_DVDNAV
5489
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
3922 case MP_CMD_DVDNAV_EVENT: {
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
3923 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
3924 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
3925
5627
a05efac12472 dvdnav hotfix
arpi
parents: 5621
diff changeset
3926 /* 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
3927 if (stream->type != STREAMTYPE_DVDNAV) break;
5627
a05efac12472 dvdnav hotfix
arpi
parents: 5621
diff changeset
3928
5489
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
3929 if (!dvdnav_event) {
13577
606d90e03a2f printf --> mp_msg conversion
diego
parents: 13502
diff changeset
3930 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
3931 break;
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
3932 }
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
3933
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
3934 //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
3935
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
3936 switch (dvdnav_event->event) {
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
3937 case DVDNAV_BLOCK_OK: {
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
3938 /* be silent about this one */
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
3939 break;
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
3940 }
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
3941 case DVDNAV_HIGHLIGHT: {
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
3942 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
3943 if (!hevent) {
13577
606d90e03a2f printf --> mp_msg conversion
diego
parents: 13502
diff changeset
3944 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
3945 break;
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
3946 }
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
3947
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
3948 if (hevent->display && hevent->buttonN>0)
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
3949 {
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
3950 //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
3951 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
3952 hevent->buttonN,
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
3953 hevent->sx,hevent->sy,
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
3954 hevent->ex,hevent->ey,
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
3955 hevent->pts, d_video->pts);
13577
606d90e03a2f printf --> mp_msg conversion
diego
parents: 13502
diff changeset
3956 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
3957 //osd_show_dvd_nav_delay = 60;
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
3958
16933
ef03a74ca7af 10l: osd_show_dvd_nav_highlight is just a flag
ranma
parents: 16929
diff changeset
3959 osd_show_dvd_nav_highlight=1; /* this is just a flag */
5489
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
3960 osd_show_dvd_nav_sx=hevent->sx;
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
3961 osd_show_dvd_nav_ex=hevent->ex;
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
3962 osd_show_dvd_nav_sy=hevent->sy;
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
3963 osd_show_dvd_nav_ey=hevent->ey;
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
3964 }
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
3965 else {
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
3966 osd_show_dvd_nav_highlight=0;
13577
606d90e03a2f printf --> mp_msg conversion
diego
parents: 13502
diff changeset
3967 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
3968 }
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
3969 break;
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
3970 }
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
3971 case DVDNAV_STILL_FRAME: {
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
3972 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
3973
13577
606d90e03a2f printf --> mp_msg conversion
diego
parents: 13502
diff changeset
3974 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
3975 while (dvdnav_stream_sleeping(dvdnav_priv)) {
9464
a4e50ab9ac14 3x10l found by Dan Christiansen <danchr@daimi.au.dk>
alex
parents: 9380
diff changeset
3976 usec_sleep(1000); /* 1ms */
5489
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
3977 }
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
3978 dvdnav_stream_sleep(dvdnav_priv,still_event->length);
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
3979 break;
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
3980 }
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
3981 case DVDNAV_STOP: {
13577
606d90e03a2f printf --> mp_msg conversion
diego
parents: 13502
diff changeset
3982 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
3983 break;
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
3984 }
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
3985 case DVDNAV_NOP: {
13577
606d90e03a2f printf --> mp_msg conversion
diego
parents: 13502
diff changeset
3986 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
3987 break;
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
3988 }
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
3989 case DVDNAV_SPU_STREAM_CHANGE: {
6971
6fc2e5d5f323 dvdnav api changed
jonas
parents: 6954
diff changeset
3990 #if DVDNAVVERSION > 012
6fc2e5d5f323 dvdnav api changed
jonas
parents: 6954
diff changeset
3991 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
3992
13577
606d90e03a2f printf --> mp_msg conversion
diego
parents: 13502
diff changeset
3993 mp_msg(MSGT_FIXME, MSGL_FIXME, MSGTR_DvdnavNavSpuStreamChangeVerbose,
6971
6fc2e5d5f323 dvdnav api changed
jonas
parents: 6954
diff changeset
3994 stream_change->physical_wide,
6fc2e5d5f323 dvdnav api changed
jonas
parents: 6954
diff changeset
3995 stream_change->physical_letterbox,
6fc2e5d5f323 dvdnav api changed
jonas
parents: 6954
diff changeset
3996 stream_change->physical_pan_scan,
6fc2e5d5f323 dvdnav api changed
jonas
parents: 6954
diff changeset
3997 stream_change->logical);
6fc2e5d5f323 dvdnav api changed
jonas
parents: 6954
diff changeset
3998
6fc2e5d5f323 dvdnav api changed
jonas
parents: 6954
diff changeset
3999 if (vo_spudec && dvdsub_id!=stream_change->physical_wide) {
6fc2e5d5f323 dvdnav api changed
jonas
parents: 6954
diff changeset
4000 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
4001 d_dvdsub->id,stream_change->physical_wide);
6fc2e5d5f323 dvdnav api changed
jonas
parents: 6954
diff changeset
4002 // FIXME: need a better way to change SPU id
6fc2e5d5f323 dvdnav api changed
jonas
parents: 6954
diff changeset
4003 d_dvdsub->id=dvdsub_id=stream_change->physical_wide;
6fc2e5d5f323 dvdnav api changed
jonas
parents: 6954
diff changeset
4004 if (vo_spudec) spudec_reset(vo_spudec);
6fc2e5d5f323 dvdnav api changed
jonas
parents: 6954
diff changeset
4005 }
6fc2e5d5f323 dvdnav api changed
jonas
parents: 6954
diff changeset
4006 #else
6fc2e5d5f323 dvdnav api changed
jonas
parents: 6954
diff changeset
4007 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
4008
13577
606d90e03a2f printf --> mp_msg conversion
diego
parents: 13502
diff changeset
4009 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
4010 stream_change->physical,
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
4011 stream_change->logical);
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
4012
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
4013 if (vo_spudec && dvdsub_id!=stream_change->physical) {
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
4014 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
4015 d_dvdsub->id,stream_change->physical);
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
4016 // 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
4017 d_dvdsub->id=dvdsub_id=stream_change->physical;
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
4018 if (vo_spudec) spudec_reset(vo_spudec);
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
4019 }
16490
f17b3c152fd6 Add comments to a few #endif statements in order to make clear which
diego
parents: 16489
diff changeset
4020 #endif /* DVDNAVVERSION > 012 */
5489
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
4021 break;
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
4022 }
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
4023 case DVDNAV_AUDIO_STREAM_CHANGE: {
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
4024 int aid_temp;
6971
6fc2e5d5f323 dvdnav api changed
jonas
parents: 6954
diff changeset
4025 #if DVDNAVVERSION > 012
6fc2e5d5f323 dvdnav api changed
jonas
parents: 6954
diff changeset
4026 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
4027 #else
5489
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
4028 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
4029 #endif
5489
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
4030
13577
606d90e03a2f printf --> mp_msg conversion
diego
parents: 13502
diff changeset
4031 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
4032 stream_change->physical,
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
4033 stream_change->logical);
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
4034
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
4035 aid_temp=stream_change->physical;
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
4036 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
4037 if (d_audio && audio_id!=aid_temp) {
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
4038 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
4039 d_audio->id,aid_temp);
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
4040 // 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
4041 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
4042 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
4043 }
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
4044
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
4045 break;
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
4046 }
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
4047 case DVDNAV_VTS_CHANGE: {
13577
606d90e03a2f printf --> mp_msg conversion
diego
parents: 13502
diff changeset
4048 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
4049 break;
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
4050 }
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
4051 case DVDNAV_CELL_CHANGE: {
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
4052 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
4053 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
4054
13577
606d90e03a2f printf --> mp_msg conversion
diego
parents: 13502
diff changeset
4055 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
4056 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
4057 /*
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
4058 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
4059 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
4060 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
4061 cell_playback->playback_time.hour,
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
4062 cell_playback->playback_time.minute,
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
4063 cell_playback->playback_time.second,
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
4064 cell_playback->playback_time.frame_u);
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
4065
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
4066 */
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
4067 //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
4068 //abs_seek_pos=0;
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
4069 break;
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
4070 }
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
4071 case DVDNAV_NAV_PACKET: {
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
4072 // printf("DVDNAV Event: Nav Packet\n");
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
4073 break;
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
4074 }
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
4075 case DVDNAV_SPU_CLUT_CHANGE: {
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
4076 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
4077
13577
606d90e03a2f printf --> mp_msg conversion
diego
parents: 13502
diff changeset
4078 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
4079 // send new palette to SPU decoder
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
4080 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
4081
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
4082 break;
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
4083 }
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
4084 case DVDNAV_SEEK_DONE: {
13577
606d90e03a2f printf --> mp_msg conversion
diego
parents: 13502
diff changeset
4085 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
4086 break;
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
4087 }
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
4088 }
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
4089
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
4090 // free the dvdnav event
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
4091 free(dvdnav_event->details);
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
4092 free(dvdnav_event);
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
4093 cmd->args[0].v.v=NULL;
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
4094 }
5380
8a01cde9cf39 DVDnav support patch by David Holm and Kees Cook <mplayer@outflux.net>
arpi
parents: 5367
diff changeset
4095 case MP_CMD_DVDNAV: {
5489
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
4096 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
4097
5627
a05efac12472 dvdnav hotfix
arpi
parents: 5621
diff changeset
4098 /* 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
4099 if (stream->type != STREAMTYPE_DVDNAV) break;
5627
a05efac12472 dvdnav hotfix
arpi
parents: 5621
diff changeset
4100
5380
8a01cde9cf39 DVDnav support patch by David Holm and Kees Cook <mplayer@outflux.net>
arpi
parents: 5367
diff changeset
4101 switch (cmd->args[0].v.i) {
8a01cde9cf39 DVDnav support patch by David Holm and Kees Cook <mplayer@outflux.net>
arpi
parents: 5367
diff changeset
4102 case MP_CMD_DVDNAV_UP:
5489
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
4103 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
4104 break;
8a01cde9cf39 DVDnav support patch by David Holm and Kees Cook <mplayer@outflux.net>
arpi
parents: 5367
diff changeset
4105 case MP_CMD_DVDNAV_DOWN:
5489
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
4106 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
4107 break;
8a01cde9cf39 DVDnav support patch by David Holm and Kees Cook <mplayer@outflux.net>
arpi
parents: 5367
diff changeset
4108 case MP_CMD_DVDNAV_LEFT:
5489
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
4109 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
4110 break;
8a01cde9cf39 DVDnav support patch by David Holm and Kees Cook <mplayer@outflux.net>
arpi
parents: 5367
diff changeset
4111 case MP_CMD_DVDNAV_RIGHT:
5489
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
4112 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
4113 break;
8a01cde9cf39 DVDnav support patch by David Holm and Kees Cook <mplayer@outflux.net>
arpi
parents: 5367
diff changeset
4114 case MP_CMD_DVDNAV_MENU:
13577
606d90e03a2f printf --> mp_msg conversion
diego
parents: 13502
diff changeset
4115 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
4116 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
4117 break;
8a01cde9cf39 DVDnav support patch by David Holm and Kees Cook <mplayer@outflux.net>
arpi
parents: 5367
diff changeset
4118 case MP_CMD_DVDNAV_SELECT:
5489
5e6e08ff47d5 dvdnav support improved - patch by Kees Cook <mplayer@outflux.net>
arpi
parents: 5488
diff changeset
4119 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
4120 break;
8a01cde9cf39 DVDnav support patch by David Holm and Kees Cook <mplayer@outflux.net>
arpi
parents: 5367
diff changeset
4121 default:
8a01cde9cf39 DVDnav support patch by David Holm and Kees Cook <mplayer@outflux.net>
arpi
parents: 5367
diff changeset
4122 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
4123 break;
8a01cde9cf39 DVDnav support patch by David Holm and Kees Cook <mplayer@outflux.net>
arpi
parents: 5367
diff changeset
4124 }
8a01cde9cf39 DVDnav support patch by David Holm and Kees Cook <mplayer@outflux.net>
arpi
parents: 5367
diff changeset
4125 break;
8a01cde9cf39 DVDnav support patch by David Holm and Kees Cook <mplayer@outflux.net>
arpi
parents: 5367
diff changeset
4126 }
16490
f17b3c152fd6 Add comments to a few #endif statements in order to make clear which
diego
parents: 16489
diff changeset
4127 #endif /* USE_DVDNAV */
4858
65730cea02e7 add half new input support for gui
pontscho
parents: 4856
diff changeset
4128 default : {
65730cea02e7 add half new input support for gui
pontscho
parents: 4856
diff changeset
4129 #ifdef HAVE_NEW_GUI
65730cea02e7 add half new input support for gui
pontscho
parents: 4856
diff changeset
4130 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
4131 else
65730cea02e7 add half new input support for gui
pontscho
parents: 4856
diff changeset
4132 #endif
10397
6180d7558f75 output typo fixes: unknow --> unknown
diego
parents: 10341
diff changeset
4133 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
4134 }
4858
65730cea02e7 add half new input support for gui
pontscho
parents: 4856
diff changeset
4135 }
13991
28a6f0847c58 add "pausing" prefix for MPlayer commands
reimar
parents: 13956
diff changeset
4136 if (cmd->pausing)
28a6f0847c58 add "pausing" prefix for MPlayer commands
reimar
parents: 13956
diff changeset
4137 osd_function = OSD_PAUSE;
4418
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
4138 mp_cmd_free(cmd);
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
4139 }
8141d2c399e4 A new configurable input system and joystick support for this system
albeu
parents: 4395
diff changeset
4140 }
7111
b65b78640d49 removed old input code
alex
parents: 7068
diff changeset
4141
651
617ae66624b3 -ss patch by Loring Holden
arpi_esp
parents: 645
diff changeset
4142 if (seek_to_sec) {
937
a8a34da9c17f when using -ss:
laaz
parents: 933
diff changeset
4143 int a,b; float d;
a8a34da9c17f when using -ss:
laaz
parents: 933
diff changeset
4144
a8a34da9c17f when using -ss:
laaz
parents: 933
diff changeset
4145 if (sscanf(seek_to_sec, "%d:%d:%f", &a,&b,&d)==3)
a8a34da9c17f when using -ss:
laaz
parents: 933
diff changeset
4146 rel_seek_secs += 3600*a +60*b +d ;
a8a34da9c17f when using -ss:
laaz
parents: 933
diff changeset
4147 else if (sscanf(seek_to_sec, "%d:%f", &a, &d)==2)
a8a34da9c17f when using -ss:
laaz
parents: 933
diff changeset
4148 rel_seek_secs += 60*a +d;
a8a34da9c17f when using -ss:
laaz
parents: 933
diff changeset
4149 else if (sscanf(seek_to_sec, "%f", &d)==1)
a8a34da9c17f when using -ss:
laaz
parents: 933
diff changeset
4150 rel_seek_secs += d;
a8a34da9c17f when using -ss:
laaz
parents: 933
diff changeset
4151
a8a34da9c17f when using -ss:
laaz
parents: 933
diff changeset
4152 seek_to_sec = NULL;
651
617ae66624b3 -ss patch by Loring Holden
arpi_esp
parents: 645
diff changeset
4153 }
937
a8a34da9c17f when using -ss:
laaz
parents: 933
diff changeset
4154
2365
93616490c0dd -loop patch by Pascal Haakmat <a.haakmat@chello.nl>
arpi
parents: 2353
diff changeset
4155 /* Looping. */
3540
1bfa5284f160 -loop fixed
arpi
parents: 3532
diff changeset
4156 if(eof==1 && loop_times>=0) {
5655
117f34bb7097 Add correct loop option parsing in command line parser.
albeu
parents: 5651
diff changeset
4157 int l = loop_times;
117f34bb7097 Add correct loop option parsing in command line parser.
albeu
parents: 5651
diff changeset
4158 play_tree_iter_step(playtree_iter,0,0);
117f34bb7097 Add correct loop option parsing in command line parser.
albeu
parents: 5651
diff changeset
4159 loop_times = l;
3540
1bfa5284f160 -loop fixed
arpi
parents: 3532
diff changeset
4160 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
4161
3540
1bfa5284f160 -loop fixed
arpi
parents: 3532
diff changeset
4162 if(loop_times>1) loop_times--; else
1bfa5284f160 -loop fixed
arpi
parents: 3532
diff changeset
4163 if(loop_times==1) loop_times=-1;
8198
1935017c0f71 Experimantal OSD menu
albeu
parents: 8164
diff changeset
4164 play_n_frames=play_n_frames_mf;
2365
93616490c0dd -loop patch by Pascal Haakmat <a.haakmat@chello.nl>
arpi
parents: 2353
diff changeset
4165 eof=0;
3540
1bfa5284f160 -loop fixed
arpi
parents: 3532
diff changeset
4166 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
4167 loop_seek = 1;
2365
93616490c0dd -loop patch by Pascal Haakmat <a.haakmat@chello.nl>
arpi
parents: 2353
diff changeset
4168 }
93616490c0dd -loop patch by Pascal Haakmat <a.haakmat@chello.nl>
arpi
parents: 2353
diff changeset
4169
1627
eeaee1632340 absolute seek debugging with 1-8 keys (disabled by default)
arpi
parents: 1626
diff changeset
4170 if(rel_seek_secs || abs_seek_pos){
1466
7845f6d7c4ba format-specific seeking code moved to demuxer_ stuff
arpi
parents: 1462
diff changeset
4171 current_module="seek";
1627
eeaee1632340 absolute seek debugging with 1-8 keys (disabled by default)
arpi
parents: 1626
diff changeset
4172 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
4173 // success:
4079
ae78dd1d8daf Add vobsub support.
kmkaplan
parents: 4064
diff changeset
4174 /* FIXME there should be real seeking for vobsub */
8966
arpi
parents: 8965
diff changeset
4175 if(sh_video) sh_video->pts=d_video->pts;
4079
ae78dd1d8daf Add vobsub support.
kmkaplan
parents: 4064
diff changeset
4176 if (vo_vobsub)
11589
5cff0d11b47b vobsub seeking support by Lu Ran
alex
parents: 11584
diff changeset
4177 //vobsub_reset(vo_vobsub);
5cff0d11b47b vobsub seeking support by Lu Ran
alex
parents: 11584
diff changeset
4178 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
4179 #if 0
5836
dcb0a2bf3345 Fix osd progress bar.
albeu
parents: 5830
diff changeset
4180 if(sh_video && d_video->packs == 0)
dcb0a2bf3345 Fix osd progress bar.
albeu
parents: 5830
diff changeset
4181 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
4182 if(sh_audio){
5836
dcb0a2bf3345 Fix osd progress bar.
albeu
parents: 5830
diff changeset
4183 if(d_audio->packs == 0)
dcb0a2bf3345 Fix osd progress bar.
albeu
parents: 5830
diff changeset
4184 ds_fill_buffer(d_audio);
8027
b9da278e4c92 verbose can be negative
arpi
parents: 8023
diff changeset
4185 if(verbose>0){
1459
622c504f36ef printf stuff moved seek.c->mplayer.c, resetting drop_frame_cnt after seek
arpi
parents: 1457
diff changeset
4186 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
4187 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
4188 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
4189 }
1567
5c7760aa4f94 printf->mp_msg/mp_dbg
arpi
parents: 1564
diff changeset
4190 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
4191 } else {
1567
5c7760aa4f94 printf->mp_msg/mp_dbg
arpi
parents: 1564
diff changeset
4192 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
4193 }
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
4194 #endif
1459
622c504f36ef printf stuff moved seek.c->mplayer.c, resetting drop_frame_cnt after seek
arpi
parents: 1457
diff changeset
4195 fflush(stdout);
622c504f36ef printf stuff moved seek.c->mplayer.c, resetting drop_frame_cnt after seek
arpi
parents: 1457
diff changeset
4196
4593
3769ccb8da8b libvo's query_ stuff replaced by new control() - patch by David Holm
arpi
parents: 4587
diff changeset
4197 if(sh_video){
3769ccb8da8b libvo's query_ stuff replaced by new control() - patch by David Holm
arpi
parents: 4587
diff changeset
4198 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
4199 resync_video_stream(sh_video);
5511
7a24a067f0af vo_config_count now counts calls to vo->config()
arpi
parents: 5507
diff changeset
4200 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
4201 }
3769ccb8da8b libvo's query_ stuff replaced by new control() - patch by David Holm
arpi
parents: 4587
diff changeset
4202
1459
622c504f36ef printf stuff moved seek.c->mplayer.c, resetting drop_frame_cnt after seek
arpi
parents: 1457
diff changeset
4203 if(sh_audio){
1466
7845f6d7c4ba format-specific seeking code moved to demuxer_ stuff
arpi
parents: 1462
diff changeset
4204 current_module="seek_audio_reset";
1334
061cabfbc07b some more cleanup
arpi
parents: 1331
diff changeset
4205 audio_out->reset(); // stop audio, throwing away buffered data
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
4206 }
1334
061cabfbc07b some more cleanup
arpi
parents: 1331
diff changeset
4207 // Set OSD:
16992
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
4208 if(!loop_seek){
8531
1aa2c9b460af Merged EDL 0.5 patch - it's something like Quicktime's edit lists.
arpi
parents: 8494
diff changeset
4209 #ifdef USE_EDL
16992
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
4210 if( !edl_decision )
8531
1aa2c9b460af Merged EDL 0.5 patch - it's something like Quicktime's edit lists.
arpi
parents: 8494
diff changeset
4211 #endif
16992
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
4212 set_osd_bar(0,"Position",0,100,demuxer_get_percent_pos(demuxer));
1334
061cabfbc07b some more cleanup
arpi
parents: 1331
diff changeset
4213 }
16992
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
4214
4587
886bf5274992 Audio only support. Include a fix in the asf demuxer opening.
albeu
parents: 4552
diff changeset
4215 if(sh_video) {
886bf5274992 Audio only support. Include a fix in the asf demuxer opening.
albeu
parents: 4552
diff changeset
4216 c_total=0;
886bf5274992 Audio only support. Include a fix in the asf demuxer opening.
albeu
parents: 4552
diff changeset
4217 max_pts_correction=0.1;
886bf5274992 Audio only support. Include a fix in the asf demuxer opening.
albeu
parents: 4552
diff changeset
4218 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
4219 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
4220 drop_frame_cnt=0;
886bf5274992 Audio only support. Include a fix in the asf demuxer opening.
albeu
parents: 4552
diff changeset
4221 too_slow_frame_cnt=0;
886bf5274992 Audio only support. Include a fix in the asf demuxer opening.
albeu
parents: 4552
diff changeset
4222 too_fast_frame_cnt=0;
3744
d358f4a74690 dvd seeking -> subtitle disappearing bugs fixed
arpi
parents: 3742
diff changeset
4223
5488
3f183ca22747 fixed SPU pts, it's 1024/90000 based instead of 1/100
arpi
parents: 5463
diff changeset
4224 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
4225 }
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
4226 }
8531
1aa2c9b460af Merged EDL 0.5 patch - it's something like Quicktime's edit lists.
arpi
parents: 8494
diff changeset
4227 #ifdef USE_EDL
13168
ce046ef860da EDL enhancement/fixes:
rtognimp
parents: 13132
diff changeset
4228 /*
13358
567875b88aab Hardcoded EDL messages moved to help_mp-en.h, Doxygen comments added, patch
diego
parents: 13353
diff changeset
4229 * 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
4230 * and find the next EDL action to take care of.
13168
ce046ef860da EDL enhancement/fixes:
rtognimp
parents: 13132
diff changeset
4231 */
ce046ef860da EDL enhancement/fixes:
rtognimp
parents: 13132
diff changeset
4232
13882
8a928d5b42b8 Replaces edl_mute_count with togle making code more understandable, other trivial list suggested changes too, Patch by Oded Shimon
reynaldo
parents: 13868
diff changeset
4233 edl_muted = 0;
13168
ce046ef860da EDL enhancement/fixes:
rtognimp
parents: 13132
diff changeset
4234 next_edl_record = edl_records;
ce046ef860da EDL enhancement/fixes:
rtognimp
parents: 13132
diff changeset
4235
ce046ef860da EDL enhancement/fixes:
rtognimp
parents: 13132
diff changeset
4236 while (next_edl_record)
ce046ef860da EDL enhancement/fixes:
rtognimp
parents: 13132
diff changeset
4237 {
13358
567875b88aab Hardcoded EDL messages moved to help_mp-en.h, Doxygen comments added, patch
diego
parents: 13353
diff changeset
4238 /* 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
4239 * prior EDL implementation lacks this.
13168
ce046ef860da EDL enhancement/fixes:
rtognimp
parents: 13132
diff changeset
4240 */
ce046ef860da EDL enhancement/fixes:
rtognimp
parents: 13132
diff changeset
4241
ce046ef860da EDL enhancement/fixes:
rtognimp
parents: 13132
diff changeset
4242 if (next_edl_record->start_sec >= sh_video->pts)
ce046ef860da EDL enhancement/fixes:
rtognimp
parents: 13132
diff changeset
4243 break;
13867
4b9c901a6d23 Fix EDL mute behavior, Patch by Oded Shimon
reynaldo
parents: 13858
diff changeset
4244
13882
8a928d5b42b8 Replaces edl_mute_count with togle making code more understandable, other trivial list suggested changes too, Patch by Oded Shimon
reynaldo
parents: 13868
diff changeset
4245 if (next_edl_record->action == EDL_MUTE) edl_muted = !edl_muted;
13168
ce046ef860da EDL enhancement/fixes:
rtognimp
parents: 13132
diff changeset
4246 next_edl_record = next_edl_record->next;
ce046ef860da EDL enhancement/fixes:
rtognimp
parents: 13132
diff changeset
4247
ce046ef860da EDL enhancement/fixes:
rtognimp
parents: 13132
diff changeset
4248 }
13882
8a928d5b42b8 Replaces edl_mute_count with togle making code more understandable, other trivial list suggested changes too, Patch by Oded Shimon
reynaldo
parents: 13868
diff changeset
4249 if ((user_muted | edl_muted) != mixer.muted) mixer_mute(&mixer);
8531
1aa2c9b460af Merged EDL 0.5 patch - it's something like Quicktime's edit lists.
arpi
parents: 8494
diff changeset
4250 #endif
1405
8ecf18884ad8 seeking code moved out from mplayer.c -> seek.c
arpi
parents: 1402
diff changeset
4251 rel_seek_secs=0;
1627
eeaee1632340 absolute seek debugging with 1-8 keys (disabled by default)
arpi
parents: 1626
diff changeset
4252 abs_seek_pos=0;
5929
9e7d54e7be58 - frame_time delayed one frame, as it's really duration of current frame,
arpi
parents: 5927
diff changeset
4253 frame_time_remaining=0;
1466
7845f6d7c4ba format-specific seeking code moved to demuxer_ stuff
arpi
parents: 1462
diff changeset
4254 current_module=NULL;
8784
6e190ea2abba don't show OSD progbar when -loop seeks back
arpi
parents: 8745
diff changeset
4255 loop_seek=0;
1466
7845f6d7c4ba format-specific seeking code moved to demuxer_ stuff
arpi
parents: 1462
diff changeset
4256 }
7845f6d7c4ba format-specific seeking code moved to demuxer_ stuff
arpi
parents: 1462
diff changeset
4257
1723
5e4214a7540e GUI stuff. now seeking works, and xmga renders to video window
arpi
parents: 1709
diff changeset
4258 #ifdef HAVE_NEW_GUI
5e4214a7540e GUI stuff. now seeking works, and xmga renders to video window
arpi
parents: 1709
diff changeset
4259 if(use_gui){
5789
0132c5747e8a fix audio only files play
pontscho
parents: 5698
diff changeset
4260 guiEventHandling();
7751
27c9c440536f - dvd aspect changing bug - fixed
pontscho
parents: 7749
diff changeset
4261 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
4262 // 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
4263 guiIntfStruct.Position=(float)d_video->pack_no*100.0f/sh_video->video.dwLength;
1735
bdc1ec6fe668 gui seekbar position fixed
arpi
parents: 1730
diff changeset
4264 } else {
6914
d882c7063e6d gui seekbar pos calc overflow fixed
arpi
parents: 6912
diff changeset
4265 off_t len = ( demuxer->movi_end - demuxer->movi_start );
d882c7063e6d gui seekbar pos calc overflow fixed
arpi
parents: 6912
diff changeset
4266 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
4267 guiIntfStruct.Position=(len <= 0? 0.0f : ( pos - demuxer->movi_start ) * 100.0f / len );
1735
bdc1ec6fe668 gui seekbar position fixed
arpi
parents: 1730
diff changeset
4268 }
8966
arpi
parents: 8965
diff changeset
4269 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
4270 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
4271 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
4272 guiGetEvent( guiReDraw,NULL );
6903
c2d4100c964e - fix mixer handling
pontscho
parents: 6888
diff changeset
4273 guiGetEvent( guiSetVolume,NULL );
4818
3473ca9ef158 new gui interface, and gtk moved into mplayer process. fork ... bleh :)
pontscho
parents: 4807
diff changeset
4274 if(guiIntfStruct.Playing==0) break; // STOP
3473ca9ef158 new gui interface, and gtk moved into mplayer process. fork ... bleh :)
pontscho
parents: 4807
diff changeset
4275 if(guiIntfStruct.Playing==2) osd_function=OSD_PAUSE;
8423
c6a1a5b6ba25 - fix three submenu bug
pontscho
parents: 8366
diff changeset
4276 if ( guiIntfStruct.DiskChanged || guiIntfStruct.NewPlay ) goto goto_next_file;
3054
9507f90d8254 add half dvd support for gui
pontscho
parents: 3050
diff changeset
4277 #ifdef USE_DVDREAD
9507f90d8254 add half dvd support for gui
pontscho
parents: 3050
diff changeset
4278 if ( stream->type == STREAMTYPE_DVD )
9507f90d8254 add half dvd support for gui
pontscho
parents: 3050
diff changeset
4279 {
9507f90d8254 add half dvd support for gui
pontscho
parents: 3050
diff changeset
4280 dvd_priv_t * dvdp = stream->priv;
7854
d6c29d863f15 dvd chapter detect function from Gregory Kovriga
pontscho
parents: 7805
diff changeset
4281 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
4282 }
9507f90d8254 add half dvd support for gui
pontscho
parents: 3050
diff changeset
4283 #endif
1723
5e4214a7540e GUI stuff. now seeking works, and xmga renders to video window
arpi
parents: 1709
diff changeset
4284 }
16490
f17b3c152fd6 Add comments to a few #endif statements in order to make clear which
diego
parents: 16489
diff changeset
4285 #endif /* HAVE_NEW_GUI */
1723
5e4214a7540e GUI stuff. now seeking works, and xmga renders to video window
arpi
parents: 1709
diff changeset
4286
5e4214a7540e GUI stuff. now seeking works, and xmga renders to video window
arpi
parents: 1709
diff changeset
4287
220
5348fa1313fe OSD functionality improved
arpi_esp
parents: 215
diff changeset
4288 //================= Update OSD ====================
1422
d02e0dcaf077 libvo2 support
arpi
parents: 1421
diff changeset
4289 #ifdef USE_OSD
16992
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
4290 if(sh_video){
8800
2485bc98772d fixed some possible overflow places
alex
parents: 8784
diff changeset
4291 char osd_text_tmp[64];
16992
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
4292 // The subtitles stuff is particulary messy. Keep the mess for now it will be
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
4293 // cleaned up when properties get implemented.
7780
9806d65986e4 Mplayer can switch between subtitles of different languages during
kmkaplan
parents: 7751
diff changeset
4294 if (osd_show_vobsub_changed) {
16911
a3d705105e01 Enabled OSD localization / moved msgs to help/help_mp-en.h
ptt
parents: 16897
diff changeset
4295 snprintf(osd_text_tmp, 63, MSGTR_OSDSubtitlesOff);
16955
2026ca5663cc reordered subtitles language OSD display, since it worked bad for ogm...
ptt
parents: 16938
diff changeset
4296 switch (demuxer->type) {
2026ca5663cc reordered subtitles language OSD display, since it worked bad for ogm...
ptt
parents: 16938
diff changeset
4297 #ifdef HAVE_MATROSKA
2026ca5663cc reordered subtitles language OSD display, since it worked bad for ogm...
ptt
parents: 16938
diff changeset
4298 case DEMUXER_TYPE_MATROSKA:
2026ca5663cc reordered subtitles language OSD display, since it worked bad for ogm...
ptt
parents: 16938
diff changeset
4299 if (dvdsub_id >= 0) {
2026ca5663cc reordered subtitles language OSD display, since it worked bad for ogm...
ptt
parents: 16938
diff changeset
4300 char lang[40] = MSGTR_OSDunknown;
2026ca5663cc reordered subtitles language OSD display, since it worked bad for ogm...
ptt
parents: 16938
diff changeset
4301 demux_mkv_get_sub_lang(demuxer, dvdsub_id, lang, 39);
2026ca5663cc reordered subtitles language OSD display, since it worked bad for ogm...
ptt
parents: 16938
diff changeset
4302 lang[39] = 0;
2026ca5663cc reordered subtitles language OSD display, since it worked bad for ogm...
ptt
parents: 16938
diff changeset
4303 snprintf(osd_text_tmp, 63, MSGTR_OSDSubtitlesLanguage, dvdsub_id, lang);
2026ca5663cc reordered subtitles language OSD display, since it worked bad for ogm...
ptt
parents: 16938
diff changeset
4304 }
2026ca5663cc reordered subtitles language OSD display, since it worked bad for ogm...
ptt
parents: 16938
diff changeset
4305 break;
2026ca5663cc reordered subtitles language OSD display, since it worked bad for ogm...
ptt
parents: 16938
diff changeset
4306 #endif
13502
05f846322437 show ogg subtitle language on OSD, if available
joey
parents: 13501
diff changeset
4307 #ifdef HAVE_OGGVORBIS
16955
2026ca5663cc reordered subtitles language OSD display, since it worked bad for ogm...
ptt
parents: 16938
diff changeset
4308 case DEMUXER_TYPE_OGG:
2026ca5663cc reordered subtitles language OSD display, since it worked bad for ogm...
ptt
parents: 16938
diff changeset
4309 if (d_dvdsub && dvdsub_id >= 0) {
2026ca5663cc reordered subtitles language OSD display, since it worked bad for ogm...
ptt
parents: 16938
diff changeset
4310 char *lang = demux_ogg_sub_lang(demuxer, dvdsub_id);
2026ca5663cc reordered subtitles language OSD display, since it worked bad for ogm...
ptt
parents: 16938
diff changeset
4311 snprintf(osd_text_tmp, 63, MSGTR_OSDSubtitlesLanguage, dvdsub_id, lang ? lang : MSGTR_OSDunknown);
2026ca5663cc reordered subtitles language OSD display, since it worked bad for ogm...
ptt
parents: 16938
diff changeset
4312 }
2026ca5663cc reordered subtitles language OSD display, since it worked bad for ogm...
ptt
parents: 16938
diff changeset
4313 break;
13502
05f846322437 show ogg subtitle language on OSD, if available
joey
parents: 13501
diff changeset
4314 #endif
16955
2026ca5663cc reordered subtitles language OSD display, since it worked bad for ogm...
ptt
parents: 16938
diff changeset
4315 default:
2026ca5663cc reordered subtitles language OSD display, since it worked bad for ogm...
ptt
parents: 16938
diff changeset
4316 if (vo_vobsub && vobsub_id >= 0) {
2026ca5663cc reordered subtitles language OSD display, since it worked bad for ogm...
ptt
parents: 16938
diff changeset
4317 char *language = MSGTR_OSDnone;
2026ca5663cc reordered subtitles language OSD display, since it worked bad for ogm...
ptt
parents: 16938
diff changeset
4318 language = vobsub_get_id(vo_vobsub, (unsigned int) vobsub_id);
2026ca5663cc reordered subtitles language OSD display, since it worked bad for ogm...
ptt
parents: 16938
diff changeset
4319 snprintf(osd_text_tmp, 63, MSGTR_OSDSubtitlesLanguage, vobsub_id, language ? language : MSGTR_OSDunknown);
2026ca5663cc reordered subtitles language OSD display, since it worked bad for ogm...
ptt
parents: 16938
diff changeset
4320 }
13116
16d248dc671c fix compilation withoud libdvdread
henry
parents: 13098
diff changeset
4321 #ifdef USE_DVDREAD
16955
2026ca5663cc reordered subtitles language OSD display, since it worked bad for ogm...
ptt
parents: 16938
diff changeset
4322 if (vo_spudec && dvdsub_id >= 0) {
2026ca5663cc reordered subtitles language OSD display, since it worked bad for ogm...
ptt
parents: 16938
diff changeset
4323 char lang[3] = "\0\0\0";
2026ca5663cc reordered subtitles language OSD display, since it worked bad for ogm...
ptt
parents: 16938
diff changeset
4324 int code = 0;
2026ca5663cc reordered subtitles language OSD display, since it worked bad for ogm...
ptt
parents: 16938
diff changeset
4325 code = dvd_lang_from_sid(stream, dvdsub_id);
2026ca5663cc reordered subtitles language OSD display, since it worked bad for ogm...
ptt
parents: 16938
diff changeset
4326 if (code) {
2026ca5663cc reordered subtitles language OSD display, since it worked bad for ogm...
ptt
parents: 16938
diff changeset
4327 lang[0] = code >> 8;
2026ca5663cc reordered subtitles language OSD display, since it worked bad for ogm...
ptt
parents: 16938
diff changeset
4328 lang[1] = code;
2026ca5663cc reordered subtitles language OSD display, since it worked bad for ogm...
ptt
parents: 16938
diff changeset
4329 }
2026ca5663cc reordered subtitles language OSD display, since it worked bad for ogm...
ptt
parents: 16938
diff changeset
4330 snprintf(osd_text_tmp, 63, MSGTR_OSDSubtitlesLanguage, dvdsub_id, code ? lang : MSGTR_OSDnone);
2026ca5663cc reordered subtitles language OSD display, since it worked bad for ogm...
ptt
parents: 16938
diff changeset
4331 }
13116
16d248dc671c fix compilation withoud libdvdread
henry
parents: 13098
diff changeset
4332 #endif
16955
2026ca5663cc reordered subtitles language OSD display, since it worked bad for ogm...
ptt
parents: 16938
diff changeset
4333 break;
2026ca5663cc reordered subtitles language OSD display, since it worked bad for ogm...
ptt
parents: 16938
diff changeset
4334 }
16992
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
4335 osd_show_vobsub_changed = 0;
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
4336 set_osd_msg(OSD_MSG_SUB_CHANGED,1,osd_duration,
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
4337 "%s",osd_text_tmp);
7780
9806d65986e4 Mplayer can switch between subtitles of different languages during
kmkaplan
parents: 7751
diff changeset
4338 } else
9870
09d630a4f991 support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents: 9831
diff changeset
4339 #ifdef USE_SUB
09d630a4f991 support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents: 9831
diff changeset
4340 if (osd_show_sub_changed) {
9875
6f36703cdd2a The person who checked in the previous patch accidentally put a declaration
rsf
parents: 9870
diff changeset
4341 char *tmp2;
9870
09d630a4f991 support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents: 9831
diff changeset
4342 tmp = subdata->filename;
10211
4bc481804519 warning fixes by Dominik Mierzejewski <dominik@rangers.eu.org>
alex
parents: 10167
diff changeset
4343 if ((tmp2 = strrchr(tmp, '/'))) {
9870
09d630a4f991 support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents: 9831
diff changeset
4344 tmp = tmp2+1;
09d630a4f991 support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents: 9831
diff changeset
4345 }
16992
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
4346 set_osd_msg(OSD_MSG_SUB_CHANGED,1,osd_duration,
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
4347 MSGTR_OSDSub, set_of_sub_pos + 1,
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
4348 strlen(tmp) < 20 ? "" : "...",
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
4349 strlen(tmp) < 20 ? tmp : tmp+strlen(tmp)-19);
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
4350 osd_show_sub_changed = 0;
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
4351 }
9870
09d630a4f991 support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents: 9831
diff changeset
4352 #endif
15863
7689a7c41225 simplify osd-status display, and allow e.g. osd -2 to get the old behaviour
reimar
parents: 15862
diff changeset
4353 }
220
5348fa1313fe OSD functionality improved
arpi_esp
parents: 215
diff changeset
4354 // 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
4355 // vo_osd_text=osd_text_buffer;
16490
f17b3c152fd6 Add comments to a few #endif statements in order to make clear which
diego
parents: 16489
diff changeset
4356 #endif /* USE_OSD */
458
49b0474b2e26 I really hope that you will learn how to use cvs, sooner or later...
arpi_esp
parents: 452
diff changeset
4357
16992
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
4358 update_osd_msg();
58e526a6a8dc Big OSD cleanup. Replace the mess with 100's of counter vars
albeu
parents: 16968
diff changeset
4359
1422
d02e0dcaf077 libvo2 support
arpi
parents: 1421
diff changeset
4360 #ifdef USE_SUB
258
66017e126280 subtitles (.sub files) support
arpi_esp
parents: 240
diff changeset
4361 // find sub
14644
36d53262f626 avoid null pointer dereference with .ssa subtitles when the video codec is missing patch by Philip Chong <pchong at ic.eecs.berkeley.edu>
faust3
parents: 14610
diff changeset
4362 if(subdata && sh_video && sh_video->pts>0){
8966
arpi
parents: 8965
diff changeset
4363 float pts=sh_video->pts;
398
f5918fc8df10 more cleanup of video decoding
arpi_esp
parents: 396
diff changeset
4364 if(sub_fps==0) sub_fps=sh_video->fps;
482
1a2c4f3e7a10 sub control optimized
arpi_esp
parents: 470
diff changeset
4365 current_module="find_sub";
3274
ac7ded58b6df mpeg subtitle flickering patch by Evgeny Chukreev <codedj@echo.ru>
arpi
parents: 3257
diff changeset
4366 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
4367 find_sub(subdata, (pts+sub_delay) *
09d630a4f991 support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents: 9831
diff changeset
4368 (subdata->sub_uses_time ? 100. : sub_fps));
14684
a4767edef10d command to log current subtitle to file
henry
parents: 14644
diff changeset
4369 if (vo_sub) vo_sub_last = vo_sub;
9870
09d630a4f991 support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents: 9831
diff changeset
4370 // FIXME! frame counter...
3274
ac7ded58b6df mpeg subtitle flickering patch by Evgeny Chukreev <codedj@echo.ru>
arpi
parents: 3257
diff changeset
4371 sub_last_pts = pts;
ac7ded58b6df mpeg subtitle flickering patch by Evgeny Chukreev <codedj@echo.ru>
arpi
parents: 3257
diff changeset
4372 }
482
1a2c4f3e7a10 sub control optimized
arpi_esp
parents: 470
diff changeset
4373 current_module=NULL;
258
66017e126280 subtitles (.sub files) support
arpi_esp
parents: 240
diff changeset
4374 }
1422
d02e0dcaf077 libvo2 support
arpi
parents: 1421
diff changeset
4375 #endif
9695
68c44d3530c8 Improved xscreensaver support.
ranma
parents: 9610
diff changeset
4376
9831
0397b461f0fb MINGW32 port and select()less fifocode by Arpi
faust3
parents: 9752
diff changeset
4377 #ifdef HAVE_X11
9695
68c44d3530c8 Improved xscreensaver support.
ranma
parents: 9610
diff changeset
4378 if (stop_xscreensaver && sh_video) {
68c44d3530c8 Improved xscreensaver support.
ranma
parents: 9610
diff changeset
4379 current_module="stop_xscreensaver";
11999
239623f1e8a1 Use system clock for xscreensaver pings
ranma
parents: 11977
diff changeset
4380 xscreensaver_heartbeat();
9695
68c44d3530c8 Improved xscreensaver support.
ranma
parents: 9610
diff changeset
4381 current_module=NULL;
68c44d3530c8 Improved xscreensaver support.
ranma
parents: 9610
diff changeset
4382 }
9831
0397b461f0fb MINGW32 port and select()less fifocode by Arpi
faust3
parents: 9752
diff changeset
4383 #endif
554
d8b3c80604e3 dvd sub parser move dto mplayer.c
arpi_esp
parents: 552
diff changeset
4384
6110
7bea806b9c5f Improvment for spu subtitles.
albeu
parents: 6082
diff changeset
4385 // DVD sub:
7bea806b9c5f Improvment for spu subtitles.
albeu
parents: 6082
diff changeset
4386 if(vo_config_count && vo_spudec) {
7bea806b9c5f Improvment for spu subtitles.
albeu
parents: 6082
diff changeset
4387 unsigned char* packet=NULL;
10240
alex
parents: 10225
diff changeset
4388 int len,timestamp;
10216
d608097901b1 changed the silly func-inside-func codepice
alex
parents: 10211
diff changeset
4389 current_module="spudec";
d608097901b1 changed the silly func-inside-func codepice
alex
parents: 10211
diff changeset
4390 spudec_heartbeat(vo_spudec,90000*sh_video->timer);
6110
7bea806b9c5f Improvment for spu subtitles.
albeu
parents: 6082
diff changeset
4391 // 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
4392 while(1) {
6110
7bea806b9c5f Improvment for spu subtitles.
albeu
parents: 6082
diff changeset
4393 // Vobsub
7bea806b9c5f Improvment for spu subtitles.
albeu
parents: 6082
diff changeset
4394 len = 0;
7bea806b9c5f Improvment for spu subtitles.
albeu
parents: 6082
diff changeset
4395 if(vo_vobsub) {
8966
arpi
parents: 8965
diff changeset
4396 if(sh_video->pts+sub_delay>=0) {
6110
7bea806b9c5f Improvment for spu subtitles.
albeu
parents: 6082
diff changeset
4397 // The + next_frame_time is there because we'll display the sub at the next frame
8966
arpi
parents: 8965
diff changeset
4398 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
4399 if(len > 0) {
8966
arpi
parents: 8965
diff changeset
4400 timestamp -= (sh_video->pts + sub_delay - sh_video->timer)*90000;
10718
alex
parents: 10708
diff changeset
4401 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
4402 }
7bea806b9c5f Improvment for spu subtitles.
albeu
parents: 6082
diff changeset
4403 }
7bea806b9c5f Improvment for spu subtitles.
albeu
parents: 6082
diff changeset
4404 } else {
7bea806b9c5f Improvment for spu subtitles.
albeu
parents: 6082
diff changeset
4405 // DVD sub
7bea806b9c5f Improvment for spu subtitles.
albeu
parents: 6082
diff changeset
4406 len = ds_get_packet_sub(d_dvdsub,(unsigned char**)&packet);
7bea806b9c5f Improvment for spu subtitles.
albeu
parents: 6082
diff changeset
4407 if(len > 0) {
10691
665fd8af2db7 fabs needs math.h
ranma
parents: 10661
diff changeset
4408 float x = d_dvdsub->pts - sh_video->pts;
665fd8af2db7 fabs needs math.h
ranma
parents: 10661
diff changeset
4409 if (x < -10 || x > 10) // prevent missing subs on pts reset
10557
2bb2903dfb7e Prevent missing subtitles at pts reset.
ranma
parents: 10550
diff changeset
4410 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
4411 else timestamp = 90000*(sh_video->timer + sub_delay);
8966
arpi
parents: 8965
diff changeset
4412 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
4413 }
7bea806b9c5f Improvment for spu subtitles.
albeu
parents: 6082
diff changeset
4414 }
10240
alex
parents: 10225
diff changeset
4415 if(len<=0 || !packet) break;
6204
1ba75212f7ef Little fix for vobsub/dvd subtitles
albeu
parents: 6190
diff changeset
4416 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
4417 else spudec_assemble(vo_spudec,packet,len,timestamp);
554
d8b3c80604e3 dvd sub parser move dto mplayer.c
arpi_esp
parents: 552
diff changeset
4418 }
d8b3c80604e3 dvd sub parser move dto mplayer.c
arpi_esp
parents: 552
diff changeset
4419
6190
bd6748605681 Bounding box and partial update patch for vob/dvdsub by Hephooey.
atmos4
parents: 6185
diff changeset
4420 /* 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
4421 if(spudec_changed(vo_spudec))
bd6748605681 Bounding box and partial update patch for vob/dvdsub by Hephooey.
atmos4
parents: 6185
diff changeset
4422 vo_osd_changed(OSDTYPE_SPU);
6110
7bea806b9c5f Improvment for spu subtitles.
albeu
parents: 6082
diff changeset
4423 current_module=NULL;
7bea806b9c5f Improvment for spu subtitles.
albeu
parents: 6082
diff changeset
4424 }
7bea806b9c5f Improvment for spu subtitles.
albeu
parents: 6082
diff changeset
4425
1421
ea0a0b9e6fbc nosound avi seeking fixed
arpi
parents: 1420
diff changeset
4426 } // while(!eof)
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
4427
1567
5c7760aa4f94 printf->mp_msg/mp_dbg
arpi
parents: 1564
diff changeset
4428 mp_msg(MSGT_GLOBAL,MSGL_V,"EOF code: %d \n",eof);
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
4429
1639
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
4430 }
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
4431
3618
772729dd7b40 better dvd support
pontscho
parents: 3597
diff changeset
4432 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
4433
6138
523014df7d32 big cosmetics patch, cleanup of messages printed by mplayer and libs.
arpi
parents: 6135
diff changeset
4434 mp_msg(MSGT_CPLAYER,MSGL_INFO,"\n");
523014df7d32 big cosmetics patch, cleanup of messages printed by mplayer and libs.
arpi
parents: 6135
diff changeset
4435
4221
401149ba73fd Fixed bug with benchmark option
albeu
parents: 4203
diff changeset
4436 if(benchmark){
401149ba73fd Fixed bug with benchmark option
albeu
parents: 4203
diff changeset
4437 double tot=video_time_usage+vout_time_usage+audio_time_usage;
401149ba73fd Fixed bug with benchmark option
albeu
parents: 4203
diff changeset
4438 double total_time_usage;
401149ba73fd Fixed bug with benchmark option
albeu
parents: 4203
diff changeset
4439 total_time_usage_start=GetTimer()-total_time_usage_start;
401149ba73fd Fixed bug with benchmark option
albeu
parents: 4203
diff changeset
4440 total_time_usage = (float)total_time_usage_start*0.000001;
5151
610d399f50c3 - cleanup pass 1. more to come soon...
arpi
parents: 5138
diff changeset
4441 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
4442 video_time_usage,vout_time_usage,audio_time_usage,
401149ba73fd Fixed bug with benchmark option
albeu
parents: 4203
diff changeset
4443 total_time_usage-tot,total_time_usage);
401149ba73fd Fixed bug with benchmark option
albeu
parents: 4203
diff changeset
4444 if(total_time_usage>0.0)
5151
610d399f50c3 - cleanup pass 1. more to come soon...
arpi
parents: 5138
diff changeset
4445 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
4446 100.0*video_time_usage/total_time_usage,
401149ba73fd Fixed bug with benchmark option
albeu
parents: 4203
diff changeset
4447 100.0*vout_time_usage/total_time_usage,
401149ba73fd Fixed bug with benchmark option
albeu
parents: 4203
diff changeset
4448 100.0*audio_time_usage/total_time_usage,
401149ba73fd Fixed bug with benchmark option
albeu
parents: 4203
diff changeset
4449 100.0*(total_time_usage-tot)/total_time_usage,
401149ba73fd Fixed bug with benchmark option
albeu
parents: 4203
diff changeset
4450 100.0);
5983
4d868c3c9fff some cleanup around uninit()
arpi
parents: 5955
diff changeset
4451 if(total_frame_cnt && frame_dropping)
5621
0426f9b887cd some more statistics: BENCHMARKn
arpi
parents: 5612
diff changeset
4452 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
4453 total_frame_cnt-drop_frame_cnt,
0426f9b887cd some more statistics: BENCHMARKn
arpi
parents: 5612
diff changeset
4454 (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
4455 drop_frame_cnt,
0426f9b887cd some more statistics: BENCHMARKn
arpi
parents: 5612
diff changeset
4456 100*drop_frame_cnt/total_frame_cnt,
0426f9b887cd some more statistics: BENCHMARKn
arpi
parents: 5612
diff changeset
4457 total_frame_cnt,
0426f9b887cd some more statistics: BENCHMARKn
arpi
parents: 5612
diff changeset
4458 (total_time_usage>0.5)?(total_frame_cnt/total_time_usage):0);
0426f9b887cd some more statistics: BENCHMARKn
arpi
parents: 5612
diff changeset
4459
4221
401149ba73fd Fixed bug with benchmark option
albeu
parents: 4203
diff changeset
4460 }
401149ba73fd Fixed bug with benchmark option
albeu
parents: 4203
diff changeset
4461
5983
4d868c3c9fff some cleanup around uninit()
arpi
parents: 5955
diff changeset
4462 // time to uninit all, except global stuff:
7677
33562a65e9e8 _EXPERIMENTAL_ option: -fixed-vo for libvo spec compliance testing
arpi
parents: 7628
diff changeset
4463 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
4464
9048
arpi
parents: 9045
diff changeset
4465 #ifdef USE_SUB
9870
09d630a4f991 support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents: 9831
diff changeset
4466 if ( set_of_sub_size > 0 )
9048
arpi
parents: 9045
diff changeset
4467 {
arpi
parents: 9045
diff changeset
4468 current_module="sub_free";
9870
09d630a4f991 support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents: 9831
diff changeset
4469 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
4470 sub_free( set_of_subtitles[i] );
09d630a4f991 support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents: 9831
diff changeset
4471 set_of_sub_size = 0;
14684
a4767edef10d command to log current subtitle to file
henry
parents: 14644
diff changeset
4472 vo_sub_last = vo_sub=NULL;
9870
09d630a4f991 support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
henry
parents: 9831
diff changeset
4473 subdata=NULL;
9048
arpi
parents: 9045
diff changeset
4474 }
arpi
parents: 9045
diff changeset
4475 #endif
arpi
parents: 9045
diff changeset
4476
4156
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4152
diff changeset
4477 if(eof == PT_NEXT_ENTRY || eof == PT_PREV_ENTRY) {
4221
401149ba73fd Fixed bug with benchmark option
albeu
parents: 4203
diff changeset
4478 eof = eof == PT_NEXT_ENTRY ? 1 : -1;
8198
1935017c0f71 Experimantal OSD menu
albeu
parents: 8164
diff changeset
4479 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
4480 eof = 1;
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
4481 } else {
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
4482 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
4483 playtree_iter = NULL;
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
4484 }
8198
1935017c0f71 Experimantal OSD menu
albeu
parents: 8164
diff changeset
4485 play_tree_step = 1;
4156
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4152
diff changeset
4486 } 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
4487 eof = eof == PT_UP_NEXT ? 1 : -1;
9368
918248af048f fuckin' 10l
pontscho
parents: 9352
diff changeset
4488 if ( playtree_iter ) {
918248af048f fuckin' 10l
pontscho
parents: 9352
diff changeset
4489 if(play_tree_iter_up_step(playtree_iter,eof,0) == PLAY_TREE_ITER_ENTRY) {
918248af048f fuckin' 10l
pontscho
parents: 9352
diff changeset
4490 eof = 1;
918248af048f fuckin' 10l
pontscho
parents: 9352
diff changeset
4491 } else {
918248af048f fuckin' 10l
pontscho
parents: 9352
diff changeset
4492 play_tree_iter_free(playtree_iter);
918248af048f fuckin' 10l
pontscho
parents: 9352
diff changeset
4493 playtree_iter = NULL;
918248af048f fuckin' 10l
pontscho
parents: 9352
diff changeset
4494 }
918248af048f fuckin' 10l
pontscho
parents: 9352
diff changeset
4495 }
5154
f67115a72b7c init/uninit libvo/ao/getch2/cache2 order fixed
arpi
parents: 5151
diff changeset
4496 } else { // NEXT PREV SRC
4156
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4152
diff changeset
4497 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
4498 }
1639
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
4499
4045
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
4500 if(eof == 0) eof = 1;
1641
b7dae998505c free stream/demuxer. continue playback with next file if error found
arpi
parents: 1639
diff changeset
4501
4045
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
4502 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
4503 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
4504 if(filename == NULL) {
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
4505 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
4506 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
4507 playtree_iter = NULL;
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
4508 };
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
4509 } else
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
4510 break;
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
4511 }
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
4512
5910
20c335d98ab3 fix fullscreen bug es ilyen libvo not initialized bug with gui igy
pontscho
parents: 5908
diff changeset
4513 #ifdef HAVE_NEW_GUI
20c335d98ab3 fix fullscreen bug es ilyen libvo not initialized bug with gui igy
pontscho
parents: 5908
diff changeset
4514 if( use_gui && !playtree_iter )
20c335d98ab3 fix fullscreen bug es ilyen libvo not initialized bug with gui igy
pontscho
parents: 5908
diff changeset
4515 {
20c335d98ab3 fix fullscreen bug es ilyen libvo not initialized bug with gui igy
pontscho
parents: 5908
diff changeset
4516 #ifdef USE_DVDREAD
6280
cf2c2b92d1a7 add VCD support for GUI
pontscho
parents: 6218
diff changeset
4517 if ( !guiIntfStruct.DiskChanged )
5910
20c335d98ab3 fix fullscreen bug es ilyen libvo not initialized bug with gui igy
pontscho
parents: 5908
diff changeset
4518 #endif
6713
cc917a581b6e add simple playlist support
pontscho
parents: 6699
diff changeset
4519 mplEnd();
5910
20c335d98ab3 fix fullscreen bug es ilyen libvo not initialized bug with gui igy
pontscho
parents: 5908
diff changeset
4520 }
20c335d98ab3 fix fullscreen bug es ilyen libvo not initialized bug with gui igy
pontscho
parents: 5908
diff changeset
4521 #endif
20c335d98ab3 fix fullscreen bug es ilyen libvo not initialized bug with gui igy
pontscho
parents: 5908
diff changeset
4522
16347
da2926d990ce Adds -idle, an option to make MPlayer wait for input ('loadfile' or
ods15
parents: 16346
diff changeset
4523 if(use_gui || playtree_iter != NULL || player_idle_mode){
da2926d990ce Adds -idle, an option to make MPlayer wait for input ('loadfile' or
ods15
parents: 16346
diff changeset
4524 if (!playtree_iter) filename = NULL;
4045
898caa690c0b playtree support. replaces old playlist and multifile mess. patch by Alban Bedel <albeu@free.fr>
arpi
parents: 3934
diff changeset
4525 eof = 0;
1641
b7dae998505c free stream/demuxer. continue playback with next file if error found
arpi
parents: 1639
diff changeset
4526 goto play_next_file;
1639
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
4527 }
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
4528
7122
0dc9cb756b68 freetype 2.0/2.1+ support - disabled by default until bugs fixed
arpi
parents: 7111
diff changeset
4529
8644
0bfd73828e33 This patch fixes so that the exit code (or return code if you like) is set
arpi
parents: 8635
diff changeset
4530 exit_player_with_rc(MSGTR_Exit_eof, 0);
1639
9423cb98e63f initial multifile support
arpi
parents: 1629
diff changeset
4531
109
ed4178146cc5 small code cleanup, removed unused variables
arpi_esp
parents: 103
diff changeset
4532 return 1;
ed4178146cc5 small code cleanup, removed unused variables
arpi_esp
parents: 103
diff changeset
4533 }