1
0
mirror of https://github.com/mpv-player/mpv synced 2024-12-14 19:05:33 +00:00
Commit Graph

62 Commits

Author SHA1 Message Date
ben
073360b3a4 sub_scale command can now handle both ass and non-ass subs at a time
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25881 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-27 15:31:24 +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
ben
e28bd7c6de Add new command to switch between dvdnav titles
Based on parts of dvdnav monster patches from Otvos Attila



git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25845 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-24 19:14:05 +00:00
ben
9b72cde125 cosmetic: reindent code after r25843
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25844 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-23 22:34:51 +00:00
ben
127ed985dd sub_scale command now works with ass subtitles renderer
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25843 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-23 22:33:46 +00:00
eugeni
f817a5dc52 Add ass_use_margins command and property to shift subtitles to margins and back
on the fly.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25842 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-23 21:18:32 +00:00
reimar
00e5fe9b31 Make mp_properties const
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25745 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-13 17:00:46 +00:00
eugeni
0d36212f39 Remove global_ass_track. Instead create an ass_track for each 't' track.
Global_ass_track obviously can not work when there is more than one 't tracks,
their lines will be mixed up.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25684 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-11 21:45:20 +00:00
eugeni
8661c5f8c0 Clear demuxed data when subtitle track is changed.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25667 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-10 19:59:09 +00:00
nicodvb
d5ac9af32e properties to get and set angle; patch by oattila chello hu
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25605 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-05 14:32:39 +00:00
ulion
3ca9d94c64 Fix property audio_delay bug when step up/down with arg value NULL.
Original patched by Davide Capodaglio <davidecapod A inwind P it>.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25595 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-05 01:40:36 +00:00
reimar
951bc25530 Add some const/static qualifiers as appropriate
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25523 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-12-24 16:27:52 +00:00
ulion
acec444aa5 Check availability before check argument for getting gamma properties.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25493 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-12-22 08:35:15 +00:00
ulion
3db51117dd Revert to r25490, since the r25491 is not correct.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25492 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-12-22 06:35:35 +00:00
ulion
61d91f8196 Combine code for check availability of property audio(id).
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25491 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-12-22 06:27:55 +00:00
ulion
376bbbdae0 Combine common code for check whether chapter is available.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25490 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-12-22 06:20:48 +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
6b51b17c51 Modified for using chapter property for $(NAME:TEXT) or ?(NAME:TEXT).
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25430 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-12-17 03:42:54 +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
d5e868e7cb Support chapter as a property.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25391 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-12-14 08:33:11 +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
reimar
2f4b840f62 Remove last remains of long-gone VOCTRL_SCREENSHOT
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25243 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-12-02 13:53:03 +00:00
ulion
595de9b1fc Support select subtitle by source, add 4 properties:
1. sub_source for current sub source (sub file, vobsub, or from demuxer).
2. sub_file for all subtitles from files.
3. sub_vobsub for all subtitles from vobsub.
4. sub_demux for all subtitles from demuxer.
Now mplayer can supply a stable and clear interface to external programs
using mplayer in slave mode to select a subtitle by its source and
its unique id for that source printed by mplayer using -identify parameter. 


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25157 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-11-25 04:09:04 +00:00
ulion
647585034a Fix pausing_toggle not continue play bug when it follows a pause immediately.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25060 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-11-17 11:23:58 +00:00
voroshil
c4debc9042 Implement X/27/0 packet decoding.
It contains information about navigation links.

Modified patch from Otvos Attila oattila at chello dot hu


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24264 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-08-28 14:10:47 +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
2c57acb279 Extract a poor int declaration from within the uncouth grip of an if statement
where it lay stranded in violation of both syntax and decency.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24183 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-08-25 16:15:46 +00:00
diego
11dbdc22db Fix warnings:
In file included from mplayer.c:191:
mp_fifo.h:5: warning: redundant redeclaration of 'mplayer_put_key'
mp_core.h:129: warning: previous declaration of 'mplayer_put_key' was here
In file included from command.c:59:
mp_fifo.h:5: warning: redundant redeclaration of 'mplayer_put_key'
mp_core.h:129: warning: previous declaration of 'mplayer_put_key' was here


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24182 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-08-25 16:03:02 +00:00
diego
86354b25dd Move button variable into the if () where it is actually used.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24174 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-08-25 13:08:49 +00:00
diego
d5fe94ec4c Fix unused variable warning when USE_DVDNAV is not defined.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24170 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-08-25 12:47:41 +00:00
voroshil
f1fbca4bdd Automatic TV channels scanning ability for MPlayer.
Code is based on patch from Otvos Attila oattila at chello dot hu


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24125 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-08-23 16:09:30 +00:00
voroshil
4f0d56b9ae Teletext support.
Part 2/5: options/slaves/configure/definitions/etc


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23920 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-07-29 17:55:28 +00:00
reimar
641d9d1156 subdata must be set to NULL when the corresponding data was freed.
"mp_input_queue_cmd(mp_input_parse_cmd("sub_select"));" will do this
somewhen as well, but that might already be too late.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23858 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-07-25 17:13:02 +00:00
reimar
06292ecdbf Do not set vo_sub to NULL on changing subtitles, update_subtitles
will do this when called with reset == 1.
Fixes subtitles getting stuck when switching via 'j'.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23857 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-07-25 17:11:22 +00:00
reimar
dfae0dfa58 Make sure that sub->id is -2 and sub->sh is NULL if subtitle doesn't
exist. Probably sanest way to avoid crash in e.g. mov demuxer without
having to check both all the time.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23786 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-07-15 17:56:06 +00:00
aurel
8f167a73b8 add support for subtitles thru lavf
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23778 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-07-13 21:15:24 +00:00
albeu
c1d4199f67 10L, sub_scale need freetype, add the #ifdef.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23760 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-07-10 16:08:29 +00:00
albeu
63865de207 Add a loop command and property.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23747 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-07-09 14:52:46 +00:00
albeu
1544e64717 Add the sub_scale property and command.
Patch from Anatoli Marinov (anatoli [dot] marinov [at] gmail [dot] com).


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23745 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-07-09 11:19:21 +00:00
reimar
547ae18be2 Simplify and correct subtitle selection, no more special cases for
DVD and Matroska and -sid should now always match the ID_* message.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23619 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-06-24 08:10:07 +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
zuxy
be09bd1c04 The audio balance feature implemented with af_pan.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23588 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-06-20 02:26:20 +00:00
reimar
eb6179a168 Merge (trivial) dvdnav and dvdread subtitle selection code
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23569 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-06-17 08:29:26 +00:00
reimar
b6e735fde1 Make sure we do not access demuxer->s_streams out of bounds
when invalid -sid is given


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23568 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-06-17 08:26:07 +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
albeu
5ac14727cb Add new properties percent_pos and time_pos.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23436 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-05-31 13:07:52 +00:00
albeu
b63e23147d Make the length property use the time type.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23435 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-05-31 13:02:51 +00:00
albeu
be63729ba5 Move the time printing code out of the length property.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23434 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-05-31 12:42:02 +00:00
albeu
f24d313473 Allow setting the direction in the step_property command.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23430 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-05-31 09:42:14 +00:00
albeu
17ac1fe1ce Fix the step_property coammand to correctly handle the step size with
all numerical types.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23429 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-05-31 09:13:21 +00:00