1
0
mirror of https://github.com/mpv-player/mpv synced 2025-03-30 15:29:56 +00:00
Commit Graph

1526 Commits

Author SHA1 Message Date
Uoti Urpala
0d59f81e54 Add option pointer to vf struct 2008-04-23 13:41:05 +03:00
Uoti Urpala
7039bc090a Add option pointer to demuxers and stheader.h structs 2008-04-23 13:41:05 +03:00
Uoti Urpala
d3d12332d6 Declare demuxer *_streams fields with proper types
Give sh_audio_t, sh_video_t and sh_sub_t which before had typedef
names only a matching struct name (without _t) too.
Change the a_streams, v_streams and s_streams demuxer fields from
void * to struct sh_audio *, struct sh_video * and struct sh_sub *.
Remove a now unnecessary cast from mplayer.c.
2008-04-23 13:41:05 +03:00
Uoti Urpala
732ee3474a Move options "vo" and "ao" to common struct 2008-04-23 13:41:05 +03:00
Uoti Urpala
9db0c118d3 Start of new option system
First part of option restructuring. The aim is to move option values
from a huge number of separate globals to a single non-global struct.

This part adds some support for parsing option values into such struct
instances, and moves one example option (fixed-vo) to the struct.
2008-04-23 13:41:05 +03:00
Uoti Urpala
e5e8effca8 Add a context argument to mp_input_add_event_fd callback 2008-04-23 13:41:04 +03:00
Uoti Urpala
2bcfe1e077 Add new video driver API
Create new video driver API that has a per-instance context structure
and does not rely on keeping status in global or static variables.
Existing drivers are not yet converted to this API; instead there is a
wrapper which translates calls to them.

In the new API, an old API call vo_functions->xyz(args) is generally
replaced by vo_xyz(vo_instance, args).

The changes to keep the vesa, dxr2 and xover drivers compiling have
not been tested.
2008-04-23 13:41:04 +03:00
albeu
6e62b3a85f Add options to disable some or all config files.
Patch by Andrew Savchenko (Bircoph -at- list -dot- ru).


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26448 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-14 11:21:29 +00:00
albeu
e4dc453ea0 Replace the trivial command line preparser with a more robust version
allowing all kind of options to be used.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26440 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-13 19:18:51 +00:00
albeu
f481e7870b Remove the need for code using stream to export an mp_input_check_interrupt()
function. It also removes the compile-time dependency on input.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26358 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-09 00:36:28 +00:00
uau
12ff2d2644 Add some const qualifiers to reduce warnings
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26320 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-02 01:01:22 +00:00
uau
99901138ab Remove unnecessary includes
command.c: Don't include libmpcodecs/mp_image.h, libmpdemux/matroska.h
mplayer.c: Don't include libmpdemux/matroska.h
matroska.h: Remove declaration of already removed function
            demux_mkv_change_subs and stop including demuxer.h


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26313 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-01 15:24:53 +00:00
eugeni
7cc46c2e87 Support 'default' attribute for audio and subtitle tracks.
The first default track is chosen for playback if language-based selection
failes. Additionally, for audio tracks, the first one is chosen if there are
no default tracks at all.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26301 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-03-30 16:55:46 +00:00
reimar
57521c3467 Handle property commands in idle mode.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26296 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-03-28 08:30:53 +00:00
reimar
7d42c23753 Experimental support for -framedrop with -correct-pts.
The code is not really correct, but it is very little and works "well enough"
to be useful in my tests.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26260 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-03-17 20:21:16 +00:00
diego
079182e047 cosmetics: Decrapify the indentation of the last few blocks of main().
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26191 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-03-07 17:16:10 +00:00
diego
2a9e515c77 Move duplicated extern declarations of mp_msg_levels and mp_msg_level_all
to cfg-common.h where they are really needed.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26162 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-03-04 21:45:36 +00:00
diego
bc2c5f3f6c Add ID_SEEKABLE information to -identify output.
patch by Mathieu SCHROETER, mathieu.schroeter gamesover ch


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26144 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-03-03 09:53:18 +00:00
eugeni
22465e56cc Select audio stream in mplayer and mencoder, overriding demuxer decision.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26122 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-02-29 17:25:50 +00:00
eugeni
96b0752265 Demuxer-independent subtitle track selection.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26119 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-02-29 17:25:44 +00:00
reimar
576e184411 Attempt to fix -chapter broken for mkv in r25987
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26113 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-02-28 19:41:40 +00:00
diego
f087f0f503 Fix continuous scrolling on OS/2 due to status line updates unless -quiet
option is specified. The problem is similar on Windows, so share the same
workaround for both systems.
patch by KO Myung-Hun, komh chollian net


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26059 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-02-22 06:57:51 +00:00
diego
febce72028 OS/2 getch2() support
patch by KO Myung-Hun, komh chollian net


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26048 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-02-21 16:20:33 +00:00
diego
895fc25553 Rename mp_input_win32_slave_cmd_func to mp_input_slave_cmd_func.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26047 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-02-21 16:15:31 +00:00
diego
77eb726c3d Remove pointless #ifdefs around extern declarations.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26039 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-02-20 08:51:53 +00:00
reimar
c1a683ad8c Change force_fps and force_ofps to double
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25997 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-02-14 14:50:34 +00:00
diego
835c654bb0 typo fix: inited --> initialized
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25994 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-02-14 14:23:55 +00:00
nicodvb
f785eba8a1 -chapter is now handled uniformly calling demuxer_seek_chapter() instead
of letting individual demuxers and stream readers do their nasty job


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25987 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-02-11 22:03:34 +00:00
reimar
4820129d42 Do not reset correct_pts in mp_dvdnav_reset_stream, it does not seem necessary
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25952 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-02-03 12:17:10 +00:00
reimar
6921ab9e24 ao_functions_t should be const, part 1
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25945 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-02-01 20:11:14 +00:00
reimar
5960ddb8e5 Use defines to give names to the different seek flags.
A better solution should be considered later, esp. for the many
broken demuxers that do not treat these flags correctly.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25911 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-29 15:11:38 +00:00
reimar
3b2a50aca9 Make sure sub_font is freed.
Patch by Guillaume LECERF (foxcore gmail com).


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25880 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-27 15:15:55 +00:00
reimar
f2cfee65cc Support vobsub palette in extradata, as exported by libavformat
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25872 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-26 23:47:25 +00:00
ben
ca13485af8 Check for stream change in dvdnav.
Set new aspect ratio if needed (for example in cell change)



git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25859 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-26 16:18:58 +00:00
ben
d56fe785be Add support for dvdnav still frames playback.
Based on various patches from Otvos Attila
and MPlayer'ized by me.

N.B. Always use -vc ffmpeg12 with dvdnav://



git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25852 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-26 11:51:34 +00:00
ulion
b060a1c644 Fix auto-sub code to support filenames with any extension length.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25818 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-20 15:39:13 +00:00
reimar
fda4dce8a0 audio_out / video_out structs should be treated as const
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25793 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-19 11:33:36 +00:00
eugeni
55b1facb6c Instead of keeping attachments in mkv demuxer, use demuxer_add_attachment().
These attachments are passed to libass after demuxer is opened.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25686 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-12 01:12:39 +00:00
ben
989b1fe59b allow profile loading per audio/video output
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25669 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-10 23:32:50 +00:00
ben
1043075a0d factorizes variable check
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25664 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-10 18:46:08 +00:00
ben
8944441a44 add support for per protocol and per extension playback profile loading
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25663 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-10 18:45:08 +00:00
reimar
50e083bdb9 Use getppid instead of getpid and move a snprintf to where it is actually needed.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25653 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-08 22:18:48 +00:00
reimar
afb944d4c0 Simplify a needlessly complex use of snprintf
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25652 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-08 22:18:35 +00:00
reimar
876b028289 Do not use exit_player in the signal handler, this code just can not
be called from a signal handler.
Instead only make the input system generate quit commands for the first
CTRL+C and otherwise do getch2_disable and exit.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25651 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-08 21:40:44 +00:00
eugeni
87340de57f Clear fonts when the file is closed.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25650 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-08 12:46:20 +00:00
reimar
c3d4f52d7c Add heartbeat-cmd option
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25639 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-07 12:30:15 +00:00
reimar
3dc7792ae3 Make some functions in mplayer.c static
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25634 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-06 22:03:59 +00:00
reimar
2634462d21 Remove useless #ifdefs
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25495 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-12-22 11:25:59 +00:00
ulion
673246be0c OSD menu support mouse selection.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25489 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-12-22 06:14:38 +00:00
ulion
50c286342e Ignore mouse pos command when pausing.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25464 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-12-19 16:17:26 +00:00
ulion
fafef9cb9d Make libmenu init and uninit in proper place.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25461 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-12-19 08:42:18 +00:00
ulion
6cc3def957 Do not operate on vobsub when no video (Bug ).
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25444 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-12-18 03:33:36 +00:00
diego
8a00a66de3 Replace some more broken SYS_DARWIN preprocessor conditionals with __APPLE__.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25425 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-12-16 23:50:05 +00:00
nicodvb
c5ad15d8c0 dvb cleanup: call dvb_(set|step)_channel() without dereferencing stream->priv (1000l to me)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25405 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-12-15 13:05:06 +00:00
ulion
e9c921bbe1 Support chapter in OSD menu.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25392 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-12-14 08:39:45 +00:00
ulion
4f4c08415c Fix libass to support -nofontconfig.
For history reason, fontconfig is auto-enabled when ass is enabled,
we keep this behavior and document it clearly.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25379 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-12-12 10:00:34 +00:00
ulion
d2ace632c6 When auto loading subs, log warning instead of error for load failure.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25292 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-12-04 12:34:44 +00:00
ulion
0f04ca9adf Skip empty vobsub streams when selecting subtitles.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25279 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-12-03 04:08:36 +00:00
ulion
8db062d683 Remove the pause filter and the cmd queue hack, to know the mplayer going to
pause by checking mpctx directly. If there's any video update before the pause
then capture the frame or fallback to use last captured frame as pausing frame.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25054 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-11-15 01:07:56 +00:00
reimar
bdff251d87 Make crash-debug gdb auto-execute "bt"
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25010 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-11-10 11:14:15 +00:00
reimar
406dab851b Restore terminal for gdb with -crash-debug by calling getch2_disable()
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25009 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-11-10 11:09:08 +00:00
ulion
b1f1d02ceb Fix memory leak caused by after calling mp_input_get_cmd didn't free the cmd.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24975 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-11-06 03:41:15 +00:00
ulion
ecd1cd4168 Old code for dvdsub_id fix assume the global_sub_indices[SUB_SOURCE_DEMUX]
must be zero when use a dvdsub_id greater than max sub id from demux.
To remove the implicit assumption, make it up here.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24962 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-11-04 05:23:46 +00:00
cehoyos
0b82590c74 We support gcc 2.95 (fixes r24928).
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24941 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-11-02 23:45:57 +00:00
uau
d7f6cb23de A/V sync: take audio filter buffers into account
Substract the delay caused by filter buffering when calculating
currently playing audio position. This matters for af_scaletempo which
buffers significant and varying amounts of data. For other current
filters the effect is normally insignificant.

Instead of the old time-based filter delay field (which was ignored)
this version stores the per-filter delay in units of bytes input read
without corresponding output. This allows the current scaletempo
behavior where other filters before and after it can see the same
nominal samplerate even though the real duration of the data varies;
in this case the other filters can not know the delay they're causing
in terms of real time.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24928 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-11-01 06:52:50 +00:00
uau
d33703496c Add audio filter scaletempo
Patch by Robert Juliano, juliano.1 osu edu


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24924 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-11-01 06:52:38 +00:00
uau
aa657df525 Make output samplerate independent of -speed
The samplerate requested from the audio out depended on the initial
value of playback speed on startup. Changing speed later at runtime
does not affect output samplerate; audio is always resampled instead.
Change the init code so that speed does not affect the samplerate
requested and behavior matches what you'd get by starting the file
with speed 1 and then changing it.

The previous behavior could be desirable when using a constant speed
value. However it means that if you start with a low speed and later
switch to normal speed then audio will be resampled to a low output
frequency. You can still use -srate to explicitly select the frequency.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24923 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-11-01 06:52:32 +00:00
uau
6338c068a2 Simplify init_audio_filters() arguments
Remove the following arguments as redundant: in_channels, in_format,
out_minsize, out_maxsize. The first two always equal fields of the
sh_audio_t struct given as the first argument to the function. The
last two are unused after the allocation of sh_audio->a_out_buffer
was changed to be done on demand.

After the out_minsize and out_maxsize arguments are removed the
function preinit_audio_filters() is identical to init_audio_filters(),
so remove it and use the latter instead.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24922 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-11-01 06:52:28 +00:00
uau
1844e1dd0c Change decode_audio() interface
Rewrite decode_audio to better deal with filters that handle input in
large blocks. It now always places output in sh_audio->a_out_buffer
(which was always given as a parameter before) and reallocates the
buffer if needed. After the changes filters can return arbitrarily
large blocks of data without some of it being lost. The new version
also allows simplifying some code.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24920 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-11-01 06:52:19 +00:00
uau
a6d6f18216 Clean up some fields in stheader.h structs
sh_video_t: void *video_out: only assigned to, never read. Remove.
sh_video_t: void *vfilter: change type to struct vf_instance_s *
sh_audio_t: void *afilter: change type to struct af_stream_s *

The latter two never hold different types so there's no reason to use
void *. Maybe they were originally defined that way because the
option of using pointers to incomplete struct types was missed (the
typedefs vf_instance_t and af_stream_t would require extra headers)?


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24919 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-11-01 06:52:14 +00:00
reimar
527d293139 Do not reset user-enabled mute on EOF, but only on exit.
Make behaviour more consistent with general volume control.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24337 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-03 21:11:41 +00:00
nicodvb
7ac5a60a2b moved to reinit_video_chain() the assignment of sh_video->stream_aspect, where it makes more sense
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24322 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-01 20:56:45 +00:00
nicodvb
be450f8293 if the stream reader supports it assign to the video the stream aspect ratio
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24320 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-01 15:56:19 +00:00
diego
84157efa5a Clean up the way get_path is handled: Compile get_path.c to an object to link
against instead of directly #including the C file and replace the many extern
declarations by a proper header file.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24262 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-08-28 11:20:24 +00:00
diego
9482a78e67 Fix warnings:
mplayer.c:316: warning: redundant redeclaration of 'vo_subdevice'
libvo/video_out.h:237: warning: previous declaration of 'vo_subdevice' was here
mplayer.c:317: warning: redundant redeclaration of 'ao_subdevice'
libao2/audio_out.h:44: warning: previous declaration of 'ao_subdevice' was here
mplayer.c:320: warning: redundant redeclaration of 'vo_flags'
libvo/video_out.h:189: warning: previous declaration of 'vo_flags' was here


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24184 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-08-25 16:19:42 +00:00
uau
95a174a65a Add separate event input type for terminal+vo
Add an input/input.c fd type whose read function takes no arguments and
returns no value. If such a function reads key or command events it'll
add them to the queues itself. Use this type for terminal input which
was special-cased before. The event function for X11-based VOs will use
the same type later.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24152 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-08-25 04:28:14 +00:00
uau
6a4478d677 Remove unnecessary OSD visibility code
Don't set osd_visible directly in seek code. It's usually set to the
same value by set_osd_bar() already. In the cases where set_osd_bar()
is not called or doesn't set it (seek is triggered by EDL or loop, or
there is no video output) it seems to make no difference.

This fixes a minor bug: if you set OSD level to disabled while the
progress bar was visible then doing seeks before it disappeared would
keep it visible but not change its value.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24112 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-08-21 00:24:14 +00:00
uau
e833080245 Minor code cleanup
Move timed hiding of OSD progress bar to the same place where OSD
messages are timed out.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24111 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-08-21 00:24:13 +00:00
uau
730a647a2a Remove an unnecessary #ifdef
The default version of the sleep timer no longer has the code which
required adding a different #ifdef SYS_DARWIN version, so remove
the Darwin implementation.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24090 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-08-18 05:32:45 +00:00
uau
80dd062ef9 Remove pointless #ifdef
No need to mark stdin non-select()able in the mp_input_add_key_fd call
when no HAVE_POSIX_SELECT; input.c won't use select() on anything if
that is not defined.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24061 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-08-15 04:50:55 +00:00
reimar
8259c91a1c mixer.afilter must be set to NULL when filter chain is destroyed on uninit.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23972 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-07-31 17:02:01 +00:00
voroshil
da32be7802 Teletext support
Part 4/5: teletext page rendering



git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23923 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-07-29 17:57:39 +00:00
voroshil
db734dcc15 Removing global variables from tv://
Step 8 (last): removing old globals from tv.c, tv.h,
fixing remaining references in cfg-common.h and mplayer.c



git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23909 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-07-29 10:30:41 +00:00
reimar
daa6cb6cab Get rid of a few more useless malloc casts
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23828 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-07-19 17:15:56 +00:00
reimar
d7f314b0a9 Make sure all demuxer subtitles can be selected with 'j', even
if this leaves "holes" (allows to select subtitles that do not exist).
Fixes subtitle switching with http://samples.mplayerhq.hu/sub/NeroMP4/unsupported-embedded-subs-2.mp4


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23827 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-07-19 17:14:49 +00:00
Gabrov
d2705f7abe fix redundant redeclaration warning
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23817 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-07-18 13:02:08 +00:00
albeu
f48a4beff0 Move loop_times into mpctx.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23746 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-07-09 14:51:47 +00:00
voroshil
2f76cfc28a Revert r23530.
r23530 breaks policy: notification was not sent to mailing list,
agreements of other devs were not received.
Code also should be reviewed/cleaned up/fixed.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23593 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-06-21 08:18:51 +00:00
uau
90f1c3cc92 Remove broken option reset from per-file loop
When -loop is used as a per-file option it seeks back to the start of
the file from the end and tries to reset options to their original
values. This reset is not implemented properly: it simply sets the
option variables back without running any of the associated control
code. Implementing the option reset functionality properly would be a
significant amount of work and there is no clear need for it, so I'm
simply removing the broken version.

None of this affects the use of -loop as a global option. That case has
a separate implementation which always starts a new file from scratch
with default option values.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23567 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-06-16 19:47:36 +00:00
voroshil
83a2c50ef9 Teletext support for tv:// (v4l and v4l2 only)
modified patch from Otvos Attila oattila at chello dot hu

Module uses zvbi library for all low-level  VBI operations (like I/O with vbi
device, converting vbi pages into usefull vbi_page stuctures, rendering them
into RGB32 images).

All teletext related stuff (except properties, slave commands and rendering
osd in text mode or RGB32 rendered teletext pages in spu mode) is implemented
in tvi_vbi.c

New properties:
teletext_page - switching between pages
teletext_mode - switch between on/off/opaque/transparent modes
teletext_format - (currently read-only) allows to get format info
(black/white,gray,text)
teletext_half_page - trivial zooming (displaying top/bottom half of teletext
page)

New slave commands:
teletext_add_dec - user interface for jumping to any page by editing page number
interactively
teletext_go_link - goes though links, specified on current page



git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23530 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-06-10 00:06:12 +00:00
voroshil
252f69abf7 implement "bind sections"
allows to bind one input key to several slave commands (independently for each section)
as shown below:
RIGHT seek +10
RIGHT {tv} tv_step_channel 1
RIGHT {dvdnav} dvdnav 4
Currenlty only "tv" section added.

patch by Otvos Attila oattila at chello dot hu



git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23497 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-06-07 18:06:53 +00:00
diego
ba2799502d Create a new MSGT for just the status line.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23478 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-06-05 16:13:00 +00:00
ben
194fc1b15b add new -subfont option, that allows having a different font for OSD (controls and menu) and subtitles
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23356 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-05-20 16:10:45 +00:00
uau
4014582d7b Output message fix
Add missing '\n' to "pts value <= previous", change level to INFO


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23312 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-05-14 01:23:52 +00:00
diego
5c9abf7f9f Gui --> gui
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23095 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-04-23 07:42:42 +00:00
rfelker
1400ea6fbf big surprise.. uau broke gcc 2.95 as usual
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23011 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-04-17 07:06:44 +00:00
cehoyos
633627bc58 Gui: Show correct time after seeking in audio-only files.
Patch by Onur Küçük, onur.--.-.delipenguen.net



git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22853 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-03-31 11:01:28 +00:00
rathann
259cfbe7e2 Code cleanup: don't include a .c file in mplayer.c and fix a few
"implicit declaration of function ‘mplayer_put_key’" warnings

Based on Attila's suggestions.
Approved by Uoti and Ivan.



git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22841 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-03-29 17:16:11 +00:00
cehoyos
91e150c019 Gui: Allow progress bar to move when playing mov or mp4 files
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22826 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-03-26 09:26:02 +00:00
diego
d6a63f429f Invert logic for HAVE_NO_POSIX_SELECT to HAVE_POSIX_SELECT to be in line
with the other HAVE_ #defines throughout the codebase.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22769 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-03-21 08:24:20 +00:00
uau
a4c58e8f87 Allow demuxers to return packets with no pts in -correct-pts mode
as long as there are enough pts values for frames that the decoder
returns.
This should allow passing NAL units individually.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22516 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-03-11 17:30:44 +00:00
uau
c60af33716 Move the sh_audio->delay field to mpctx->delay.
The value is related to overall a/v sync and is not used by audio
demuxers or decoders.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22506 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-03-11 06:16:14 +00:00
reimar
c73a6a15d3 Fix bad uninit when switching DVB channels.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22476 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-03-06 11:24:08 +00:00
uau
eeec36107d Fix copy-paste bug (must have broken something in the GUI)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22429 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-03-03 22:15:19 +00:00
uau
b07b695aa0 Seek to -ss position, not 0, in per-file loop.
Fixes -ss combined with per-file loop after r22356.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22383 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-03-01 00:22:03 +00:00
uau
5074d4728f Seek to -ss position without first starting audio/video from the start.
Manual seeks no longer shift -endpos position (hopefully no one
considered that a "feature").


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22356 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-02-27 01:16:59 +00:00
uau
46c3f03853 Remove some #if 0 code
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22331 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-02-24 07:28:07 +00:00
uau
e5ab09bb64 Move parsing of the -ss option to the option code.
Also fixes a memory leak of the parameter string.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22330 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-02-24 07:11:57 +00:00
uau
a8007d3c44 Fix error in comment
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22320 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-02-23 02:10:02 +00:00
uau
06160ed2c5 Reset the edl_decision flag after the seek is done.
Previously it affected every later seek (even in other files).


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22319 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-02-23 01:53:09 +00:00
uau
19e430af9a Separate function for seeking
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22318 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-02-23 01:49:51 +00:00
uau
894ea071bf Remove useless fflush(stdout) calls. mp_msg already flushes output, and
there is no other output before the calls.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22317 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-02-22 23:44:43 +00:00
uau
8443741eef Move EDL code to separate functions
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22316 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-02-22 21:05:31 +00:00
uau
24de991a1c Fix nonsense function type
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22308 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-02-22 05:39:17 +00:00
uau
3c0c8686fd Cleanup, move "global" state from the frame_time_remaining mainloop
variable to mpctx.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22306 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-02-21 21:59:33 +00:00
uau
e65e0651d5 Fix GUI compilation
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22304 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-02-21 19:14:49 +00:00
uau
122cd3e706 Add missing "if (use_gui)" before some GUI calls
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22303 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-02-21 19:08:00 +00:00
uau
00b3c78196 Fix menu to work with mpctx
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22302 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-02-21 18:28:48 +00:00
uau
45f2227e52 Add missing #ifdef
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22299 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-02-21 03:13:48 +00:00
uau
d5d4c6c7e2 Split command/property handling from mplayer.c to a new file command.c.
Move some global and static variables under a struct that can be given
as a parameter. Add a context argument to the property functions so that
they do not have to depend on global/static variables.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22298 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-02-21 00:49:24 +00:00
uau
7ac889b796 Remove remnants of the nonfunctional "grab_frames" command.
The command has been a no-op for years.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22273 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-02-19 06:20:47 +00:00
uau
6f797ffeab Remove unused variable "osd_level_saved"
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22254 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-02-18 00:41:09 +00:00
reimar
6683b20b62 Make sure that -sid works even if the number of subtitles initially detected
by the demuxer is smaller. Should improve a bit problems with non-selectable
DVD/VOB subtitles.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22252 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-02-17 21:12:27 +00:00
reimar
4b774aacd1 Move some subtitle handling from mplayer.c to mpcommon.c and share it with mencoder.c
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22251 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-02-17 21:04:46 +00:00
reimar
c0d2859fc8 Clear/update subtitles after seeking backwards.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22202 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-02-11 13:23:13 +00:00
uau
dd9ef5468e reindent
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22163 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-02-06 00:24:49 +00:00
uau
b5c470a029 Fix multiple appearing or appearing+disappearing subs in the same frame
in non-ASS mode. The latter is common (old sub replaced by new) and 
resulted in an incorrect frame where both appeared simultaneously.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22162 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-02-06 00:18:35 +00:00
uau
d524405f5c Add missing type to declaration and remove unused variable
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22161 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-02-05 23:56:18 +00:00
reimar
de73d4dd97 Another round of subtitle code cleanup
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22155 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-02-05 18:25:28 +00:00
gpoirier
333436a8aa filename double-conversion, especially usefull for CJK users :-)
Patch by Zuxy Meng <zuxy.meng@gmail.com> 
date: Oct 25, 2006 2:20 AM
subject: [MPlayer-dev-eng] [PATCH] Filename double-conversion


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22020 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-26 09:57:09 +00:00
michael
25736732af print_version() and others get executed before the command line has been parsed so -really-quiet does not silence them even though it should according to the verbosity level set by it, this simple change/hack fixes it
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21948 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-17 00:27:41 +00:00
diego
cae4f4e7b4 DO NOT recommend or even suggest installing codecs.conf.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21906 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-13 11:57:40 +00:00
reimar
61e4a80191 Subtitle handling cleanup: factor out code for parsing embedded subtitles
and adding and removing of lines in subtitle struct into subreader.c.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21845 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-06 19:07:58 +00:00
ben
5028a513dd restore volume if muted at exit
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21820 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-04 16:30:06 +00:00
vayne
42552b211a avoid code duplication.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21780 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-28 15:31:48 +00:00
nicodvb
21515f91bb show audio language in osd when playing dvdnav streams
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21620 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-14 23:11:11 +00:00
nicodvb
1b36df0c85 call dvd_lang_from_aid() only if stream_type is DVD
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21618 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-14 22:37:13 +00:00
nicodvb
b24971e15f support for -alang in dvdnav
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21617 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-14 22:12:28 +00:00
nicodvb
5244303111 check that stream_type is DVD before calling dvd_lang_from_aid
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21578 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-10 17:28:56 +00:00
nicodvb
6c985e22b4 show subtitle language in OSD ; patch by Otvos Attila
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21577 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-10 17:28:01 +00:00
nicodvb
14dc3c4f29 use dvdnav's palette if available
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21555 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-09 19:24:12 +00:00
diego
0810e42750 Make MPlayer/MEncoder print the compile-time configuration in verbose mode.
based on a patch by Brian Murray, brian game-sat com


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21358 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-28 18:29:24 +00:00
ben
1e30c2e5ae keep nav highlight event in dvdnav priv structure
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21235 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-25 17:44:22 +00:00
nicodvb
6913dd5d92 support for -slang and subtitles in dvdnav; patch by Attila Otvos (oattila chello hu) and me. No palette yet
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21219 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-25 14:46:21 +00:00
ben
42eecb4f1b better nav highlight handling
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21216 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-25 13:03:51 +00:00
ben
c913e7dba1 support for dvdnav menu buttons overlay as simple alpha boxes (rework from Otvos Attila's series of patches)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21209 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-25 11:20:02 +00:00
uau
544233bded Make compilation depending on USE_OSD unconditional.
USE_OSD was hardcoded to true in configure, manually turning it off
would break compilation, and most OSD-related code wasn't affected by it
anyway so it did nothing useful.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21177 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-22 19:21:16 +00:00
uau
2b50b7ddab Make compilation depending on USE_SUB unconditional.
USE_SUB was hardcoded to true in configure, manually turning it off
would break compilation, and there's no apparent reason why having all
subtitle code under #ifdefs (even working ones) would be worth the
clutter.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21156 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-21 20:48:17 +00:00
reimar
68faef14e9 Reuse init_vo_spudec in subtitle switching code.
Also generalize vobsub and ass init code to work for demuxers
besides matroska (fixes subtitle switching with
http://samples.mplayerhq.hu/sub/NeroMP4/unsupported-embedded-subs-2.mp4)


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21136 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-21 15:48:00 +00:00
reimar
c99a4cad08 Move vo_spudec initialization into a separate function, for later reuse
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21135 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-21 15:43:23 +00:00
uau
8d6ef999b1 Move pause loop into a separate function.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21098 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-20 11:37:23 +00:00
uau
1390d0cf93 Reorganize code to move more things out of main().
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21093 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-20 09:12:07 +00:00
nicodvb
a1fc33994e in mp_property_{video,audio} permit uniniting of the corresponding chain
by setting *arg to -2


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21084 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-19 23:16:15 +00:00
reimar
8e56fda7d4 Remove superfluous demuxer->type==DEMUXER_TYPE_MATROSKA check,
d_dvdsub->id >= 0 is enough in for this case, too.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21077 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-19 19:39:16 +00:00
uau
e4a54f7196 Fix printf format/argument count mismatch in mp_property_video
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21073 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-19 18:08:03 +00:00
uau
1b0c4bb4f0 Move subtitle updating to a separate function, fix inverted condition
which caused timing of DVD subtitles to be ignored so that they were
shown as soon as they were demuxed rather than in their timed position.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21071 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-19 17:55:38 +00:00
voroshil
f41cff8360 new slave command: radio_step_freq
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21058 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-19 16:15:05 +00:00
reimar
b38e1ca6e7 Generalize subtitle switching, demux_ogg does not need a special case
anymore and demux_mov works now, too.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21054 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-19 14:23:54 +00:00
reimar
8979378150 Make sure sh_video == NULL when reinit_video_chain fails.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21047 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-19 11:21:09 +00:00
reimar
c339cf1fe5 Do not just skip a file when vo init fails, instead try to play it
as audio-only first.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21046 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-19 10:52:23 +00:00
nicodvb
7b79fac19a switch_audio and switch_video properties should be in the range -2..MAX_x_STREAMS-1
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21036 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-18 18:23:38 +00:00
uau
4799a07cf1 When changing playback speed write the current speed to OSD only after
build_afilter_chain() which can alter the value.
(Though I'm not sure whether the current limits in build_afilter_chain
are necessary or correct.)


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21028 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-18 15:50:31 +00:00
nicodvb
b96ae083af switch_program property to switch to/set a new program
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21023 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-18 14:33:04 +00:00
reimar
582d0b7cab more mp_property_deinterlace simplification, patch by
Carl Eugen Hoyos [cehoyos -at- rainbow studorg tuwien ac at]


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21018 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-18 12:38:03 +00:00
nicodvb
c7256fa6f9 implemented M_PROPERTY_SET in mp_property_{audio,video}
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21016 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-18 12:34:06 +00:00
reimar
09be641ba5 reinit_video_chain might set sh_video = NULL, so check against that.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21014 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-18 12:30:48 +00:00
uau
26eb093e5d Mark some functions static
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21002 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-18 07:38:58 +00:00
reimar
b9b610ed9a Support palette for general vobsub
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20994 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-17 20:11:52 +00:00
reimar
8846cfd6dc consistently use M_PROPERTY_ERROR/M_PROPERTY_OK as return values.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20991 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-17 19:03:53 +00:00
reimar
e9c16c4b55 Minor mp_property_deinterlace simplification
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20990 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-17 18:18:28 +00:00
reimar
7b25afd742 Add deinterlace property, patch by Carl Eugen Hoyos
(cehoyos [at] rainbow studorg tuwien ac at) with small modifications
by me.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20989 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-17 18:16:21 +00:00
nicodvb
17fde01155 handle video stream switch using 'switch_video' property'
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20965 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-16 21:25:35 +00:00
nicodvb
7ddcc3ef32 moved video codec/filters/outdevice initialization code to specific function
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20963 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-16 21:22:07 +00:00
reimar
7a71da01d6 Introduce step_property command.
Patch by Carl Eugen Hoyos [cehoyos <at> ag or at] with modifications by me.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20931 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-14 19:52:21 +00:00
reimar
5dcb8b7d82 Fix Unkown -> Unknown typo
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20930 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-14 19:24:41 +00:00
uau
45200bc6df Use vf control for reading pts from vf_vo
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20922 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-14 14:02:55 +00:00
reimar
de555bc284 Fix statement-before-declaration warnings.
Having a look at the gcc output before committing is a good idea btw.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20920 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-14 13:41:24 +00:00
uau
31482783c5 Remove write-only variable
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20919 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-14 12:39:49 +00:00
uau
a703241aa9 Update OSD contents only after the correct values for the frame are known.
The most visible inaccuracy caused by the previous update location was
that the OSD always showed position 0 after seeking with demux_mkv.
Split frame decoding and filtering because with -correct-pts the pts
value that should be displayed for the frame is only known after
decoding but is needed before filtering (during which the OSD is drawn).


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20918 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-14 12:29:20 +00:00
uau
0830e05453 Move xscreensaver_heartbeat call next to vo check_events
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20916 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-14 09:52:49 +00:00
uau
173381f74d Replace sleep time calculation in main() with a separate function.
Fixes some problems with playback_speed!=1: sleep limits which were
supposed to be real time were calculated in scaled time, timing
inaccuracies in nosound mode affected next frame by 
err*(1-1/playback_speed), auto quality code used scaled time.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20915 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-14 09:29:03 +00:00
uau
d1628d12f5 simplify
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20914 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-14 06:56:17 +00:00
uau
c29775e901 Move -frames check out of frame flip code (like -endpos earlier)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20913 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-14 06:49:37 +00:00
uau
7181a091f8 Remove some unused code.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20912 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-14 06:44:16 +00:00
uau
031e9068cc Move endpos handling from page flip code to a saner location, change < to <=
If the shown frame was already at exactly the end pos we don't want to
show one more frame after it.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20911 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-14 06:35:55 +00:00
uau
186e0d274e move vo event check together with gui event check
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20910 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-14 06:25:02 +00:00
uau
9e9851231f Remove some incorrect code
This code was apparently intended to duplicate frames in constant-
framerate output in case of skipped input frames, but the test used
(blit_frame not set at that location) is not correct for that use.
If removing this code turns out to make the brokenness of other code
more apparent then a better fix might be needed.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20908 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-14 05:56:20 +00:00
uau
e978f405a1 Try filling audio buffers more if they're very large, add some comments.
Larger buffers could make sense with lots of high-bitrate audio
channels.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20906 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-14 04:17:41 +00:00
uau
b65c295b31 Move audio playing code from main() into a separate function.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20905 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-14 03:13:45 +00:00
uau
8c6ce53875 Remove useless check.
sh_video should always be non-NULL if this code is run.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20904 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-14 01:59:46 +00:00
uau
a6863268cc Split some from main() into separate functions.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20903 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-14 01:40:06 +00:00
uau
0f6d5e4fd9 Change value used to indicate "unknown audio format" from 0 to -1.
0 collided with a valid format value.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20787 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-08 18:31:04 +00:00
nicodvb
faa4d4ea23 now the OSD shows the value returned by demuxer_get_current_time() rather than sh_video->pts
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20766 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-07 22:57:42 +00:00
reimar
74a504f25b ARCH_X86 simplifications
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20593 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-01 18:41:25 +00:00
eugeni
978061ad27 Move ass_library initialization code to ass_mp.c.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20518 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-29 15:26:13 +00:00
eugeni
219d0cfca9 Always initialize and destroy ass_library.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20499 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-29 03:23:23 +00:00
uau
4df2014879 Always initialize libass to fix crashes caused by use without initialization.
Library init was only done if ass_enabled was true at program startup.
However there are at least 2 ways how MPlayer can later try to access
the library even if ass_enabled is false at that point:
- per-file options can turn on ass support later
- if the embeddedfonts option is enabled and the file has fonts 
  demux_mkv will call ass_process_font


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20498 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-29 00:23:12 +00:00
eugeni
efea99c2c9 Libass interface reworked:
- ass_instance_t renamed to ass_renderer_t
- ass_library_t introduced
- use of mplayer-specific global variables limited to ass_mp.c


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20493 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-28 15:07:18 +00:00
reimar
3ee22e98d4 Do not forget to clear subtitles when switching files for embedded subtitles.
Fixes bug .


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20347 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-21 23:45:41 +00:00
ptt
0e3c3727ce applied patch for -endpos, to work without a blit_frame, pointed out by Andrew Savchenko
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20329 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-21 09:32:58 +00:00
rtogni
c844ece6d4 Disable loading of file-specific configuration file from the same
directory as the played file. Add a command-line switch to enable it.
Patch by reimar, manpage patch by me


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20257 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-15 21:27:15 +00:00
reimar
e6fd2e126e Remove unused ABS define
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20213 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-14 16:31:41 +00:00
reimar
24bdd688d3 10l, used MSGTR_Unknown instead of lang in mp_property_audio
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20188 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-12 18:15:07 +00:00
reimar
1018bf78dc simplify mp_property_sub
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20187 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-12 18:10:45 +00:00
reimar
a21817cecd Cosmetics for previous mplayer.c patch
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20185 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-12 18:06:18 +00:00
reimar
ee65f7b7d9 Simplify mp_property_audio
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20184 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-12 18:03:28 +00:00
ptt
07198ca3ae modifications pointed out by reimar doffinger
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20174 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-12 14:11:39 +00:00
ptt
68613bbee7 added OSD audio switching visualization
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20162 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-11 17:25:46 +00:00
ptt
928da7a448 after a long time, finally i could add -endpos option to mplayer executable.
as oded told me on 1006 02 24, i applied it, blame me if some problem occurs,
i hope not, since i tried it for a while....


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19979 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-09-25 16:47:56 +00:00
diego
0a612539ea Fix the sound mute switch in the GUI menu by moving the corresponding
piece of GUI code after audio initialization.
patch by Stanislav Maslovski, stanislav.maslovski gmail com


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19952 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-09-23 13:06:55 +00:00
reimar
a32e00516f Fix audio stream switching with demux_mkv:
return value of demuxer_switch_audio is new stream number for
-aid, the index in a_streams array is in demuxer->audio->id instead.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19951 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-09-23 11:07:58 +00:00
nicodvb
cf23d6d116 when changing chapter, in the osd print the channel number in a more natural form:
1-based (rather than 0-based)


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19949 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-09-23 10:27:32 +00:00
nicodvb
9910eae2ba show in the osd the number of the button selected by the mouse
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19916 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-09-19 22:44:19 +00:00
jonas
776787600d Іnitial button value is -1. Only (button>0) is a correct button selection.
Initialized "dvdnav_status_t status" explicitly for clarity.



git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19914 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-09-19 21:42:43 +00:00
nicodvb
78992c7fdc report mouse coordinates after movement to dvdnav; this permits to enable button selection using the mouse; patch by Jonas Jermann and me
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19857 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-09-16 15:25:31 +00:00
nicodvb
2003857aa2 report to mplayer with a slave command the coordinates of the pointer reported by x11; rescale coordinates to [0,1]x[0,1] range - patch by Jonas Jermann and me
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19856 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-09-16 15:13:41 +00:00
nicodvb
3cb5c5b62a don't uninit the video_out when using -fixed-vo; patch by Jonas Jermann
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19843 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-09-15 17:26:30 +00:00
eugeni
21faec3791 Add repeated screenshot mode to vf_screenshot.
It is triggered by "screenshot 1".


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19839 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-09-15 13:27:59 +00:00
attila
840a77bd06 * remove extern definitions of functions in .c files
* create new .h files where necessary

todo:
* go trough other files than mplayer.c
* vf_menu_pause_update()
* mp_input_register_options()
* import_playtree_playlist_into_gui()
* import_initial_playtree_into_gui()

For more infos see http://lists.mplayerhq.hu/pipermail/mplayer-dev-eng/2006-September/045683.html
( 20060902133225.2cc82aec.attila@kinali.ch on -dev-eng )


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19814 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-09-12 16:24:23 +00:00
nicodvb
aab523e18b in mp_dvdnav_handle_input() assign the currently selected button, shown in the OSD by main()
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19780 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-09-09 22:40:22 +00:00
nicodvb
0292752ed0 first touch of support for dvdnav menus; the selection is based on the keyboard selection and is completely blind: there's not the slightest visual feedback
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19775 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-09-09 21:45:23 +00:00
nicodvb
6462618244 unconditionally include label goto_enable_cache (to be used next by dvdnav)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19773 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-09-09 21:32:06 +00:00
gpoirier
4026edffd8 fix broken term_osd output in update_osd_msg()
Patch by Andrew Savchenko Bircoph A list P ru
Original thread:
03.09.2006 13:22
[MPlayer-dev-eng] [PACTH] mplayer.c: broken term_osd output in	
update_osd_msg()


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19766 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-09-09 11:57:43 +00:00
uau
2ca1aba8b5 Disable rtc timing by default.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19762 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-09-09 02:08:52 +00:00
reimar
acf654cf8f Radio support, patch by Vladimir Voroshilov (voroshil gmail com)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19574 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-08-28 17:05:18 +00:00
ben
dd0c5220f6 extended slave mode with metadata retrieval commands
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19539 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-08-26 09:44:20 +00:00
ben
000c89175c added new helpers to allow easy metadata retrieval and make libmenu use them
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19538 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-08-25 23:14:32 +00:00
ben
a1d1ee76ba new option for libmenu that allow display of properties and metadata of currently played stream
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19535 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-08-25 19:22:51 +00:00
eugeni
2ddfdc85b3 Add VFCTRL_DRAW_EOSD.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19527 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-08-24 22:10:43 +00:00
ben
7764a187e0 added new filter option to menu file browser to only display some files according to extension
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19497 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-08-22 20:55:49 +00:00
diego
e8f5c06e76 support for disabling/enabling bitmap font support from configure
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19491 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-08-21 23:19:11 +00:00
nicodvb
b7b319395e demuxer_seek_chapter() returns informations about chapters count and name
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19484 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-08-21 19:19:00 +00:00
gpoirier
2029141cf3 fix null pointer check in add_subtitles,
patch by Konstantin G. Khlebikov % koct9i A gmail P com %


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19474 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-08-21 09:28:01 +00:00
nicodvb
7b414c9b28 seek to chapter using newly introduced demux_seek_chapter()
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19442 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-08-18 16:52:23 +00:00
eugeni
e3bf2d7343 Add subdata to ass_track conversion for external subtitles.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19407 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-08-15 19:25:46 +00:00
ivo
c13cfd750e fix segfault if an unknown property is requested
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19386 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-08-13 16:45:20 +00:00
reimar
f1ee0a4db2 Reintroduce an ugly variant of the -gui/-nogui options.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19361 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-08-08 14:13:51 +00:00
eugeni
1de0c3327d Add matroska chapter seeking capability.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19348 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-08-06 18:55:34 +00:00
uau
d3d49ba258 Don't crash if audio init fails.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19343 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-08-05 18:23:10 +00:00
reimar
76cca6cfee Move ID_AUDIO_CODEC printing after codec init again (it didn't get printed otherwise).
Thanks to tomber71 in IRC for reporting the problem.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19320 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-08-04 18:40:19 +00:00
ben
49867bd432 introduce new 'stream' directory for all stream layer related components and split them from libmpdemux
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19277 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-07-31 17:39:17 +00:00
uau
681194f99e Set user_muted in mp_property_mute(). Fixes mute turning off when
seeking.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19232 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-07-28 23:17:45 +00:00
uau
3011ebe4d1 cosmetics: fix incorrect indentation left by reimar and extra word in
comment


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19221 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-07-28 16:33:27 +00:00
uau
f39495a91b Remove code that prevented the OSD current time from going back by one
second from the previously shown value. If this was needed for something
there should be a better way to do it.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19214 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-07-28 13:59:50 +00:00
reimar
0d39e76b1e demuxer might not set i_bps, so do not divide by it in that case
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19188 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-07-26 18:52:33 +00:00
reynaldo
15e8c12de2 marks several strings inside structs as const when they hold just
read-only information and modifies GetLanguage in Gui/mplayer/gtk/menu.c 
to cope which the changes.



git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19115 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-07-16 01:40:24 +00:00
reynaldo
58ed2c3fe0 marks several read-only string parameters which aren't modified inside the called function as const. Patch by Stefan Huehner, stefan AT huehner-org
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19109 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-07-15 16:03:12 +00:00
reynaldo
1a16cbfec3 marks several string parameters as const, as they are not modified inside the function, Patch by Stefan Huehner, stefan AT huehner-org
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19058 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-07-13 05:03:43 +00:00
uau
072aca08b3 Fix = vs == typo
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19022 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-07-12 10:37:11 +00:00
rfelker
ee588c6ac7 1000000000l to whoever added c++ decl crap, probably uau..
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18988 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-07-10 02:41:06 +00:00
reimar
eed96ed0e7 No point in checking for X for windows gui, in addition the hackish
way via vo_init breaks vo_gl and vo_gl2 WinID support


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18950 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-07-08 13:59:17 +00:00
reimar
d121c0061b Change use_gui detection to accept also filenames only containing
gmplayer, like "gmplayer.exe", "gmplayer_old" etc.
Also removes (somewhat broken) WIN32 special-case


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18944 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-07-08 11:03:18 +00:00
eugeni
1b51da21f5 Indentation fix (cosmetics).
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18943 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-07-07 18:27:58 +00:00
eugeni
e15ae9a600 Initial libass release (without mencoder support).
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18942 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-07-07 18:26:51 +00:00
eugeni
512eb68dc1 Rename mkv_sh_sub_t to sh_sub_t, move it to demuxer.h.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18939 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-07-07 18:02:49 +00:00
reimar
3b1b7689f2 Remove windows-specific hack that interfered with relative path
handling and should not be needed anymore


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18934 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-07-07 11:20:06 +00:00
uau
e2727ec797 Add a new video pts tracking mode, enabled by option -correct-pts.
This mode has the following differences:
- Video timing is correct for streams with B frames, at least with some
  demuxers.
- Video filters can modify frame timestamps and insert new frames, and
  removing frames is handled better than before.
- Some things are known to break, it's not usable as the default yet.

Things should work as before when the -correct-pts option is not used.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18922 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-07-06 06:58:17 +00:00
vayne
c5cf04f543 Initial win32 gui release.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18918 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-07-06 01:51:31 +00:00
reynaldo
d2e67a69fb Modifies behavior of -edlout
Now it creates a new file and writes edit decision list (EDL) records to it
just as it did before but instead of making pas-2-seconds blocks for each
'i' keystroke  lets the user hits 'i' to mark the start or end of a block.



git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18916 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-07-05 22:47:44 +00:00
nicodvb
405a7e52e3 support for audio streams that appear after unsuccessful probing
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18902 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-07-04 20:40:18 +00:00
reynaldo
a8e3cea4b3 parse_cfgfiles as static in mplayer.c/mencoder.c, patch by Stefan Huehner, stefan AT huehner-org
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18893 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-07-03 23:18:06 +00:00
reynaldo
4f593b3393 more sizeof(char) fun
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18861 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-06-30 04:09:29 +00:00
ben
5c6bf0cfe7 switch_ratio -1 slave command restores aspect ratio to default value (geexbox patch)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18822 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-06-25 21:16:52 +00:00
uau
c22ccbb864 Revert Michael's VFCTRL_FLIP_PAGE changes ("svn merge -r 18781:18779 .")
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18782 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-06-21 23:50:23 +00:00
michael
5dc55f21c1 send flip_page() through the filter chain
ignoring the filter chain cannot and does not work with frame skip / insertion filters
if this breaks something then just reverse it, ive not exhaustively tested it ...


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18780 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-06-21 20:29:45 +00:00
uau
bd4a9d25bf Rewrite audio EOF handling logic fixing some problems that could cause
truncation of output, set flag AOPLAY_FINAL_CHUNK in play call to tell
ao there will be no more data beyond what's in current buffer.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18738 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-06-16 21:52:25 +00:00
uau
ab93c42241 Fix definition of reinit_audio_chain().
It had return type "int" even though it did not return a value (callers
do not expect one) and used old-style syntax. Changed return type to 
"void" and added "void" as parameter list.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18736 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-06-16 20:21:37 +00:00
nicodvb
8e500b6d30 removed old dvdnav code
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18735 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-06-16 19:06:00 +00:00
nicodvb
f1871d5766 restored support for dvdnav only in the stream layer; all other functionalities are disabled
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18715 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-06-14 21:58:17 +00:00
uau
900e74381f When playing an audio only file use audio time instead of video time to
set EDL mark. Fixes a NULL pointer dereference.
Problem noticed by Robert Henney, robh A rut org.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18714 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-06-14 20:20:28 +00:00
uau
6723323303 Clean up audio pts handling, make audio pts tracking in the audio-only
case work the same as with video.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18713 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-06-14 19:48:54 +00:00
nicodvb
2831b49bb5 include stream_dvd's interface from libmpdemux/stream_dvd.h
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18685 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-06-11 21:29:00 +00:00
nicodvb
8cb1b33222 moved audio codec/filters/out to a separate function that is called both at init() and to switch audio stream
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18682 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-06-11 21:16:12 +00:00
diego
0e31d5637c Unconditionally compile Matroska demuxer - oops, part missed in initial commit.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18407 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-05-09 07:17:19 +00:00
uau
8e4e1ffb74 Don't blit frame if we hit EOF and no new frame is read. Fixes picture
changing back to a previous frame after the last one with some vos.
Patch by Timothy Lee, timothy (.) lee () siriushk com  [location of the
added line changed by me].


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18390 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-05-05 17:30:52 +00:00
uau
cc7550e89d Remove a useless variable.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18324 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-04-27 22:13:59 +00:00
diego
a2fdc1955c spelling/grammar/wording fixes in doxygen and non-doxygen comments
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18317 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-04-27 13:22:23 +00:00
uau
9e6de98c11 Remove useless "#if 0" blocks
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18316 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-04-27 13:16:40 +00:00
uau
8f30963c37 Make EDL compilation unconditional
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18313 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-04-27 12:40:29 +00:00
uau
c843190441 Change common pts variables from floats to doubles. Individual demuxers
should be changed later.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18310 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-04-27 11:13:21 +00:00
uau
729d2a3827 The code setting the OSD seek direction indicator for absolute seeks was
nonsense. Fix the to-timestamp case. I don't care enough to fix the
to-percentage case so just add a comment noting it's broken.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18289 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-04-25 22:34:40 +00:00
uau
bee52bbd10 Remove updating of vo_mouse_timer_const from the main loop and also
remove the variable itself. Convert code in x11_common.c and OSD timing
that depended on the variable to use real time instead.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18288 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-04-25 21:36:02 +00:00
nicodvb
ef6264e56e simplified management of dvb channel switching
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18287 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-04-25 20:32:46 +00:00
albeu
ff9f70ad71 Doxygen attack! - Chapter 2
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18262 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-04-24 21:33:50 +00:00
rtognimp
82ee3f8271 5 - Drop more buffered audio data left from old position when seeking.
Patch by Uoti Urpala


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18244 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-04-24 11:00:20 +00:00
rtognimp
6c4d9bfe51 4 - Implement a better way to calculate current audio pts and use it for
audio decoded with ad_libvorbis, ad_ffmpeg and ad_faad.

Patch by Uoti Urpala


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18243 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-04-24 10:58:40 +00:00
rtognimp
1d62695562 1 - Remove kernel HZ=100 assumptions that are no longer true from
timing.

Patch by Uoti Urpala


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18241 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-04-24 10:26:19 +00:00
reynaldo
3a406e94d7 Get ride of the several if(identify) messy lines and rearangment of some of the output, both patches by Kiriuja mplayer-patches AT en-directo_net, his changes are barely unrelated, nevertheless Im commiting them thogeter just for the sake of my mental healt, I had both patches already applied on my local three
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18238 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-04-24 07:20:34 +00:00
diego
98aee4cb65 Remove support for default.sub.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18233 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-04-23 23:26:12 +00:00
diego
55ca108b4c Kill an unused variable warning.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18232 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-04-23 23:14:58 +00:00
albeu
44e9960dd0 Add properties to get/set the stream position and get the stream
start pos, end pos and length. Based on Reimar's patch.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18227 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-04-23 15:39:51 +00:00
albeu
7c3d8688c7 Align osd_show_text with osd_show_property_text.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18224 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-04-23 14:48:15 +00:00
albeu
116ca0c768 Add a new command: osd_show_property_text that show an expanded property
string on the OSD. Based on a patch 'by someone named "veal" on irc'
that showed the filename.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18223 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-04-23 14:31:54 +00:00
albeu
63c70fadf2 Handle the tv color control commands with the properties.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18207 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-04-22 19:29:02 +00:00
albeu
979532f2c6 Add properties for the tv input color controls.
Make the "normal" color controls fallback on the tv ones
if not available from vf/vo.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18191 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-04-22 14:30:22 +00:00
reimar
11ff3f51fb add a newline before the "Playing"... line
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18152 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-04-19 21:06:12 +00:00
corey
6867264ec4 Include buffered decoded audio in A-V sync calculations.
Patch by Uoti Urpala, uoti<<dot>>urpala<<at>>pp1<<dot>>inet<<dot>>fi


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18130 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-04-17 16:31:42 +00:00
reimar
480c621a2b do not try to load default.sub when it doesn't exist. Fixes bug .
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18100 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-04-15 09:36:53 +00:00
reimar
87fe226acb fix A-V sync overcorrection for desync due to too slow hardware.
Patch by Uoti Urpala ( uoti urpala at pp1 inet fi )


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18089 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-04-14 10:57:41 +00:00
reimar
105d22e6ff sh_audio->delay is adjusted in the wrong direction when changing audio_delay
at runtime (taking esp. long to recover with large -autosync).
Patch by Uoti Urpala [uoti urpala at pp1 inet fi]


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18048 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-04-06 12:12:08 +00:00
rfelker
e5782cf37b more cruft
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18004 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-03-30 23:47:03 +00:00
rfelker
f93707e51a arrg more of this stupid cruft
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18003 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-03-30 23:44:35 +00:00
albeu
03d71f6817 Fix stepping in the playtree when interupting libmpdemux.
Thanks to Jonas Jermann for the report.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17980 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-03-27 18:33:23 +00:00
albeu
64b3deff24 Get rid of 2 osd related hacks.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17939 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-03-24 20:42:23 +00:00
albeu
00bc2d2732 Subtitles properties: move sub_select, sub_pos, sub_visibilty,
sub_alignment and sub_forced_only to properties.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17936 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-03-24 19:32:23 +00:00
diego
eebf08b978 Convert all if(verbose>X) to mp_msg_test calls.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17933 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-03-24 08:12:03 +00:00
albeu
8b5c1be40d Fix osd_show_msg alignment and make sure msg strings
get properly 0 terminated. Thanks to Jonas Jermann
(jjermann _At_ gmx _Dot_ net) for the report.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17930 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-03-23 15:17:23 +00:00
albeu
efb50daf6e Convert fullscreen, panscan, color controls, ontop, rootwin,
border, framedrop and vsync to properties. Also add a couple
of video related properties like width, height, etc.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17929 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-03-23 01:22:43 +00:00
albeu
e978b9f5a9 Move audio_delay to a property and add a few read only properties to
query samplerate, format, etc.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17926 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-03-22 23:05:13 +00:00
albeu
0fd651ff1a Add an option to list the properties: -list-properties
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17915 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-03-22 16:35:17 +00:00
albeu
7ccf483026 Add the new property API and implement a couple properties.
Move the volume and mute command to the command to property
bridge.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17912 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-03-22 00:19:02 +00:00
michael
87323740ed feed something (hopefully correct timestamps) into the video filter chain
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17911 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-03-21 23:09:52 +00:00
diego
30bb277532 Print the mute state on the OSD.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17892 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-03-18 18:48:14 +00:00
albeu
f440a3c1bf Enable gui key bindings only when running the gui. Fix enter and esc
not working with a GUI enabled build running w/o GUI.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17891 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-03-18 18:13:22 +00:00
nicodvb
41d2f9a704 restored the ability to disable subtitles when cycling with slave command 'sub_select' (previously broken in release 1.900)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17733 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-03-05 08:55:08 +00:00
nicodvb
653243a582 don't fall back to MP_CMD_TV_LAST_CHANNEL after MP_CMD_DVB_SETCHANNEL; patch by calking a ieee d org
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17716 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-03-02 21:19:57 +00:00
corey
6f446f41b5 New option: -ignore-start
Makes mplayer and mencoder ignore dwStart in AVI files.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17655 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-02-20 09:36:10 +00:00
corey
b4e5108496 dwStart support for mplayer.
* demux_avi sets stream_delay according to dwStart
* mplayer adjusts audio_delay according to stream_delay

3 related patches are pending, and I will apply them over the next few
days if all goes well.

As I mentioned on -dev-eng, the funny indentation is in preparation for
one of those pending patches.

See:
Date: Fri, 17 Feb 2006 00:53:28 -0800
To: mplayer-dev-eng@mplayerhq.hu
Subject: [PATCH] bframes, dwStart: individual patches


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17644 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-02-18 09:26:39 +00:00
corey
1ab575101a Second-try commit of this patch.
1. Include audio_delay as an argument to demux_seek.
2. Modify demux_seek_avi to adjust the audio/video stream positions so
   that mplayer/mencoder will instantly be in sync even when -delay is
   specified.

I've quadruple checked this time; hopefully I haven't missed anything.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17637 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-02-17 01:57:41 +00:00
corey
3f6e7ce5f5 Reverse commit of unfinished patch for passing audio_delay to the demuxers.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17570 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-02-09 19:39:51 +00:00
rathann
e7db4ccf1a Patch by Stefan Huehner / stefan % huehner ! org \
patch replaces '()' for the correct '(void)' in function
declarations/prototypes which have no parameters. The '()' syntax tell
thats there is a variable list of arguments, so that the compiler cannot
check this. The extra CFLAG '-Wstrict-declarations' shows those cases.

Comments about a similar patch applied to ffmpeg:

That in C++ these mean the same, but in ANSI C the semantics are
different; function() is an (obsolete) K&R C style forward declaration,
it basically means that the function can have any number and any types
of parameters, effectively completely preventing the compiler from doing
any sort of type checking. -- Erik Slagter

Defining functions with unspecified arguments is allowed but bad.
With arguments unspecified the compiler can't report an error/warning
if the function is called with incorrect arguments. -- Måns Rullgård


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17567 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-02-09 14:08:03 +00:00
corey
15debd85d2 1. Include audio_delay as an argument to demux_seek.
2. Modify demux_seek_avi to adjust the audio/video stream positions so
   that mplayer/mencoder will instantly be in sync even when -delay is
   specified.

Other demuxers could be modified similarly in the future.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17554 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-02-07 20:22:44 +00:00
nicodvb
cb832df90c dvd subtitles should be disabled by default, and enabled specifying -sid or -slang; this fix also restores the display of other subtitles types when dvd subs are present
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17380 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-01-13 20:06:59 +00:00
rathann
2601de4120 massive attack: mp_msg printf format fixes
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17367 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-01-12 20:04:36 +00:00
henry
757387a4fc fix premature end of audio playback (audio only)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17342 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-01-08 10:18:18 +00:00
gpoirier
a68b16aec1 Update copyright date to 2006
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17313 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-01-04 15:28:02 +00:00
nicodvb
db69d933c1 don't reset dvdsub->id unless -slang is specified; assign default sub stream id when demux->sub->id is -1 (autodetect)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17287 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-01-02 20:40:25 +00:00
henry
e512aef61b check the intermediate audio buffer
otherwise, data can get stuck between the demuxer and filter layer
causing a premature end of audio.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17275 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-12-31 07:37:37 +00:00
ods15
eaee93051a change erase to end of line, fall back to old behavior if no termcap found
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17259 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-12-29 11:27:22 +00:00
ods15
8153d3c643 Fix erase to end of line with windows, windows terminal does not support
control codes.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17252 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-12-27 10:42:02 +00:00
ods15
3c3d7c2039 add "pausing_keep" and "pausing_toggle" input cmd prefixes
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17242 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-12-25 19:22:48 +00:00
ods15
95db0aeb23 Use termcap "erase to end of line" character code instead of using spaces
to end of screen.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17241 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-12-25 18:26:35 +00:00
ods15
5cba0a4078 Some more cola for msglevel, codec-cfg can't even call mp_msg_init or it'll
print bogus stuff.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17121 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-12-07 05:12:07 +00:00
ods15
0fe5fb1e00 Fix EDL to be per file, allow -edlout and -edl together as there is really
no reason not to.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17110 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-12-06 08:52:18 +00:00
ods15
5aac28ec24 new -msglevel option, constrols msg level for every msg module
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17107 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-12-06 08:42:48 +00:00
rathann
d537007fb3 mplayer.c:1928: warning: implicit declaration of function 'cache_uninit'
mplayer.c:2897: warning: implicit declaration of function 'mpcodecs_config_vo'


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17089 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-12-05 01:18:10 +00:00
albeu
575dc26398 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.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17058 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-11-27 23:29:33 +00:00
albeu
364ebd2a6f Make the osd command only switch between enabled/disabled when
using the term osd.
Also put a define to test for the term osd without #ifdef.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17022 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-11-20 23:44:46 +00:00
albeu
f99cc19968 Big OSD cleanup. Replace the mess with 100's of counter vars
with a clean and simple interface.
As a bonus osd messages can now be displayed on the console if there
is no vo (or osd is disabled in libvo).


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16993 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-11-16 16:51:48 +00:00
joey
8901ee0b0a add a switch, slave command, and vo control to toggle borderless window.
includes documentation.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16969 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-11-10 22:25:54 +00:00
ptt
d44e5c8765 reordered subtitles language OSD display, since it worked bad for ogm...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16956 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-11-09 23:18:38 +00:00
faust3
4c0cf32f51 there is no sh_video for audio only files
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16939 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-11-06 18:01:52 +00:00
ranma
f6059439b9 10l: osd_show_dvd_nav_highlight is just a flag
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16934 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-11-06 16:16:04 +00:00
ranma
649712e405 Number of frames to show the OSD shouldn't be hardcoded, derive from fps instead
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16930 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-11-06 14:44:49 +00:00
ranma
0b5e424c5f Translated strings might be longer than the originals. One unnecessary dependancy on string length fixed; quadrupled buffer size for matroska case
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16919 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-11-05 17:25:34 +00:00
ptt
d291ddf016 Enabled OSD localization / moved msgs to help/help_mp-en.h
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16912 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-11-05 01:27:38 +00:00
albeu
058afda0f8 Autoload vobsub's from ~/.mplayer/sub
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16898 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-11-03 14:19:25 +00:00
rfelker
fa5ace34d8 new message was even worse -- B/s means bytes per second, not sample!
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16789 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-10-17 18:16:28 +00:00
faust3
dbc1f67ca2 allow mencoder to load win32 codecs properly patch by Zuxy <zuxy.meng at gmail.com>
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16782 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-10-16 19:14:09 +00:00
ivo
b08efb2077 exit mplayer if audio filter init fails (same as mencoder does)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16759 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-10-13 22:41:30 +00:00