Commit Graph

98 Commits

Author SHA1 Message Date
attila 943904865f Forced subtitles patch by Arne Driescher <driescher@mpi-magdeburg.mpg.de>
For a given subtitle language you can now chose to display
  only the forced subtitles. Defaut is set to "show all subtitles"
  so that current mplayer behaviour is not changed.

For DVD:
  Use -forced_subs_only additionally to e.g. -slang en
  if you are only interested in the forced subtitles.

For VobSub:
  The idx file is now parsed for the "forced subs: ON/OFF" tag
   and used according to its settings.

Key:
  You can toggle the display of forced subtitles by pressing
   "F"  (upper case letter).


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10918 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-09-21 14:21:43 +00:00
faust3 26afe0c58c slave mode commands to print out vo_fs and sub_visibility globals, patch by Mike Swieton <swietonm at student.gvsu.edu>
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10885 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-09-19 20:44:30 +00:00
diego 74e99555e5 spelling cosmetics
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10868 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-09-14 17:52:59 +00:00
alex 5e1ed4101b 1000l
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10803 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-09-02 17:44:38 +00:00
albeu 017eaef61a Finnaly commit Nico's dvb menu. Sorry for committing this
months later :(


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10627 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-08-16 09:51:05 +00:00
albeu 38a2fa46fd I've juste found a bug which prevent to load a file whose name contain
a quote ('). The menu simply execute a "loadfile '%p'" but when the %p
is replaced by the actual value, quotes in it are not escaped !
Moreover, mp_input_parse_cmd contain some code to unescape strings but
this code was placed after the string was copied in his final buffer.

So this patch correct this issue.

By Aurélien Jacobs


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10625 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-08-15 18:45:35 +00:00
alex 2283b6305f Removed the historic cfgparser and switched full to the new config parser (altought some macros still remain for compatibility). As a side effect 90% of the warning messages are gone from the core. Things should be cleaner now and less confusing for newbies.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10595 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-08-13 16:29:32 +00:00
gabucino 89d2f5be6c reverse of accidently twice commited patch (non-unified patch suxx)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10581 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-08-12 13:22:35 +00:00
gabucino 3a9b03dea0 From: Kir Kostuchenko <kir@users.sourceforge.net>
Hi, I found that command line options brightness, hue, contrast and
saturation does not works, becouse mplayer apply it, before open tv
(kernel says invalid ioctl). Here are simple fix. Please apply.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10580 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-08-12 11:32:51 +00:00
gabucino e8a173deec Hi, here are slave commands:
tv_set_brightness
tv_set_contrast
tv_set_hue
tv_set_color

Patch by Kir Kostuchenko <kir@users.sourceforge.net>


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10578 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-08-12 07:38:49 +00:00
alex 25d941fdef dvbin fix by Nico <nsabbi@libero.it>
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10569 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-08-11 14:32:53 +00:00
gabucino bff4b3ee5e I'd like to change tv tuner frequency in the slave mode. So this patch
helps me.

Patch by Kir Kostuchenko <kir@users.sourceforge.net>


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10522 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-08-04 09:13:10 +00:00
diego aa5a82be42 Output typos fixed.
Spelling and grammar fixes in comments.
Output Cosmetics


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10399 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-07-09 01:42:19 +00:00
diego 8838b4afa6 output typo fixes: unknow --> unknown
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10398 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-07-09 01:30:24 +00:00
arpi ed9296d845 renames: DATADIR->MPLAYER_DATADIR, CONFDIR->MPLAYER_CONFDIR, LIBDIR->MPLAYER_LIBDIR
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10273 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-06-09 12:15:48 +00:00
alex 019bae008c lirccd support by Fredrik Tolf <fredrik@dolda2000.cjb.net>
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10216 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-05-30 18:23:55 +00:00
faust3 0e82afdab5 new slave mode command to show text via osd, patch by Lars Gemeinhardt <lars.gemeinhardt at searchbroker.de> (reviewed by albeu)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10117 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-05-17 09:21:21 +00:00
alex 2b1f95dcc2 keypad and function (f1-f10) suppport (currently only vo_sdl and the terminal input code supports it). Patch by Vladimir Mosgalin <mosgalin@VM10124.spb.edu>
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9892 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-04-09 17:05:39 +00:00
faust3 c02af8a34c allow select()less compilation
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9837 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-04-04 20:56:29 +00:00
albeu ec92ba43f1 Support for "internet" or "multimedia" keyboards in X11.
Patch from Jason Tackaberry <tack at auc dot ca>.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9823 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-04-04 15:04:26 +00:00
arpi 68ea3c85ba - 10l fix: it exited with return MP_INPUT_NOTHING; if all fd's have
MP_FD_NO_SELECT set!
- moved time_val stuff into if(n>0), also changed misleading while(n>0) to
  while(1) (as the loop never touch n)


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9735 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-03-29 21:52:08 +00:00
arpi 7ff83a7181 linux->osdep
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9381 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-02-09 20:18:23 +00:00
arpi 2b7d9fb595 use 'a' for subtitle aligment instead for useless gui aboutbox
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8922 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-01-12 18:56:48 +00:00
henry 29ab7de580 user friendly channel tuning + 10L fix in tvi_v4l (by Stephane Jourdois)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8628 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-12-28 22:57:39 +00:00
arpi 725ff339e7 This patch adds support for vertical subtitle alignment
control. Possible values are top, center, and bottom,
with bottom being the default. Alignment is relevant when
it comes to positioning subtitles with one line (or fewer
lines) of text relative to multi-line subtitles.

It is implemented as a new command (sub_alignment) that
without an argument cycles the alignment (between top,
center, and bottom), or with an argument sets the
alignment (0 for top, 1 for center, 2 for bottom).
The key 'i' is bound to this command.

patch by Oskar Liljeblad (oskar@osk.mine.nu)


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8535 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-12-23 01:37:43 +00:00
arpi 7f1c583447 Merged EDL 0.5 patch - it's something like Quicktime's edit lists.
(skip sections listed in a text file. it also supports creating them)
patch by Michael Halcrow <mah69@email.byu.edu>


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8532 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-12-23 00:33:22 +00:00
henry bfddb0aa03 add a TV_SET_CNANNEL command
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8495 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-12-19 10:09:43 +00:00
arpi 05802842c9 This patch makes it possible to navigate among the subtitles while
playing movies. It can be very useful when using desynched subtitles.
A new command 'sub_step' is added, which takes an integer argument.
'sub_step +1' will immediately display the next subtitle, adjusting
sub_delay as if one had used the 'sub_delay' command to navigate to
the subtitle. 'sub_step -1' displays the previous subtitle and
adjusts the sub_delay. By using these two commands you can navigate
among the subtitles without having to search blindly using 'sub_delay'.

patch by Oskar Liljeblad (oskar@osk.mine.nu)


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8366 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-12-05 00:15:56 +00:00
arpi 1d94bbed7d slave-mode commands to get movie length & pos
patch by Balatoni Denes <pnis@coder.hu>


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8365 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-12-05 00:11:12 +00:00
atmos4 6dc1b1fd0c 10l my last fix choked the last command definition, this fix seems to work correct.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8276 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-11-25 14:17:15 +00:00
atmos4 6f68af6208 Fix endless-loop if no newline at input.conf EOF
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8275 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-11-25 13:28:40 +00:00
michael 01c201dbe8 warning patch by (Dominik Mierzejewski <dominik at rangers dot eu dot org>)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8255 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-11-23 10:58:14 +00:00
albeu 32b44ba835 Add quoting support for string arguments (fix loading of file with space in
the name) and add a new command for the console


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8226 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-11-18 00:11:56 +00:00
albeu 54e31581a3 Add the possibilty to grab the keys and to filter the commands
Add the commands for the osd menu


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8197 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-11-14 23:41:44 +00:00
albeu 126725660d New config system + cleanup of header inter dependency
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8165 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-11-12 01:56:42 +00:00
albeu f8ce5ab876 Reverse Arpi's commit and put the right fix in place.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7913 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-10-25 16:06:25 +00:00
arpi 16fca14336 better error handling
based on patch by Jindrich Makovicka <makovick@kmlinux.fjfi.cvut.cz>


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7912 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-10-25 14:58:30 +00:00
arpi 288e2a0f4e rewrote the lirc code to remove the fork
patch by Albeu


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7884 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-10-23 22:23:12 +00:00
arpi 4aeac332f6 Fixed a bug in MPlayer which would prevent proper parsing of
some floating point options when the locale used has a decimal point
other than the dot character (".").
My patch inserts calls to setlocale around float parsing functions strtod()
and atof() in cfgparser.c and input/input.c.
patch by Aleksander Adamowski <olo@altkom.com.pl>


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7871 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-10-23 17:42:12 +00:00
arpi bf3c311ee8 mpdemux.c|h moved to libinput, mpdemux_check_interrupt() -> mp_input_check_interrupt()
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7863 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-10-23 14:46:20 +00:00
albeu 46e4e38d5b New feature to let mplayer read commands from a file. Mostly
useful with a fifo. Turn it one with -input file=/path/.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7841 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-10-22 14:32:17 +00:00
kmkaplan f820293e0c Mplayer can switch between subtitles of different languages during
playing by press 'j', by <hephooey@fastmail.fm>.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7780 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-10-17 15:41:20 +00:00
arpi ce587559f7 This patch adds the functionality to disable/enable subtitles while playing
a video. I mapped it to the input-keyword "sub_visibility".
This keyword is  mapped to the 'v' key on the keyboard. I tested the patch
with old-fashioned  subtitles, with freetype subtitles and DVD subtitles.
Works fine. The patch also includes documentation updates.

patch by Uwe.Reder@3SOFT.de


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7629 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-10-06 17:40:51 +00:00
arpi 0bcbbd8705 -vf eq2, LUT-based brightness/contrast/gamma correction (Y-only)
by Hampa Hug <hhug@student.ethz.ch>


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7518 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-09-27 21:08:36 +00:00
alex 0b03ca9d27 removed old input code
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7112 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-08-28 15:55:58 +00:00
arpi ddc4bdf2cb removed -W -Wall -g and other gcc-specific warning/debug options
patch by Joey Parrish <joey@yunamusic.com>


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7074 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-08-22 23:29:46 +00:00
arpi 0f4a3c14c3 new slave volume command done :
"volume <x> <abs 0|1>"
where :
        abs optionnal,
                0 : relative, x > 0 increase else decrease
                1 : static, x = volume, 0 to 100

for sofware plugin, remember to / 2.55 before commiting

patch by "j.a.l" <j.a.l@free.fr>


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7056 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-08-21 20:44:29 +00:00
kmkaplan 2f98400294 Add the input command "change_rectangle" to control the rectangle
plugin boundaries.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6889 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-08-04 02:22:27 +00:00
albeu 06693273a4 Add loadfile and loadlist commands. May be buggy if the filename contain some
spaces.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6819 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-07-26 21:26:39 +00:00
albeu d80e0a04b8 10L bugs founds by Jindrich Makovicka <makovicki at KMLinux dot fjfi dot cvuti dot cz>
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6758 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-07-20 14:26:38 +00:00