Commit Graph

110 Commits

Author SHA1 Message Date
reimar d84c42b09f stream_dvd: fix dvd_get_current_time()
Fix dvd_get_current_time so the cell argument actually has a purpose.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33603 b3059339-0415-0410-9bf9-f77b7e298cf2
2011-07-06 13:01:07 +03:00
Clément Bœsch 59fff90d94 options: change -alang and -slang to use string list type
There is no reason to use manual language list splitting when an
automatic split function is already available.

Some types change from "unsigned char" to "char", but this shouldn't
cause issues since [as]lang settings are unlikely to have characters
above 127.
2011-04-20 04:22:42 +03:00
reimar 15259f1aad stream_dvd: fill_buffer(): use given buffer, not stream's default
Fix dvd:// fill_buffer function to actually write into the specified
buffer and check that the buffer is sufficiently large.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32591 b3059339-0415-0410-9bf9-f77b7e298cf2

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32592 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-08 18:05:11 +02:00
reimar 040008b43f stream_dvd: minor cleanup
Remove a pointless and stupid condition.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32588 b3059339-0415-0410-9bf9-f77b7e298cf2

Change code to something understandable (but equivalent).

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32589 b3059339-0415-0410-9bf9-f77b7e298cf2

100l, add missing return.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32590 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-08 18:05:11 +02:00
cigaes 00f82c63b0 stream_dvd: millisecond accuracy for chapters in -identify output
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32539 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-07 20:18:21 +02:00
reimar e2d5a13f76 stream_dvd[nav]: Add const qualifiers to string arguments
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31957 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:15:48 +02:00
diego 5c76f24b09 stream_dvd: Improve seeking by position
The current code takes the angle into account. This is a mistake since
the position is independent of the angle.

patch by Olivier Rolland, billl users.sourceforge net

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31895 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:15:01 +02:00
diego 0a321e01e3 stream_dvd: Improve seeking by chapters
The current code seeks to the start of the chapter. From this
position, it then tries to figure out the starting cell. This is
completely suboptimal and error prone since the starting cell can be
directly deduced from the chapter.

patch by Olivier Rolland, billl users.sourceforge net

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31894 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:15:01 +02:00
diego fdb6ce15df stream_dvd: fix incorrect assumption about chapter count
Fix the incorrect assumption that the number of chapters of a DVD
title is equal to the number of cells.

patch by Olivier Rolland, billl users.sourceforge net

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31893 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:15:01 +02:00
Uoti Urpala 1888e57af7 cosmetics: "struct vf_instance* vf" -> "struct vf_instance *vf"
Change 'struct vf_instance' pointer arguments to more standard style
as in the subject. Also some other minor formatting fixes.

Patch by Diego Biurrun.
2010-05-29 17:20:44 +03:00
Uoti Urpala a2133d7684 options: move -chapter values to option struct
-chapter can optionally take a range with a start and an end. Add a
new option type which supports such values and use that instead of a
custom per-option function.

This commit also fixes a build configuration bug: before the
availability of the -chapter option depended on DVD functionality
being enabled in the binary, even though the option works with other
sources too.
2010-04-25 22:48:10 +03:00
Uoti Urpala 00323c06e2 Delete things related to old translation system
Remove the help/ subdirectory, configure code to create toplevel
help_mp.h, and all the '#include "help_mp.h"' lines from .c files.
2010-03-10 03:47:14 +02:00
Uoti Urpala 12d3caebc7 Merge svn changes up to r30475 2010-03-09 19:18:43 +02:00
diego 59e26907b6 Add license header to all files missing it in the stream subdirectory.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30468 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-30 22:26:47 +00:00
Uoti Urpala 5995bc175a Merge svn changes up to r29962 2009-11-23 01:56:21 +02:00
reimar af2988cbce Finally rename the STREAM_SEEK define to MP_STREAM_SEEK, there are just too many
name clashes, in particular with Windows headers (which define STREAM_SEEK as an enum type).


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29962 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-11-22 15:18:21 +00:00
Uoti Urpala 287b62163e Merge svn changes up to r29912 2009-11-16 07:01:46 +02:00
reimar 7694e9074d Move headers related to setting dvd speed to dvd_common.
This makes -dvd-speed work again.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29894 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-11-11 09:28:21 +00:00
reimar 0d40667c8c Move dvd_speed and dvd_set_speed to dvd_common and implement -dvd-speed
support for dvdnav.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29890 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-11-10 23:20:05 +00:00
reimar 36ec821836 Move arrays used by both dvd and dvdnav to dvd_common.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29889 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-11-10 23:15:48 +00:00
reimar 8f164e07a0 Share dvd_device extern declaration between dvd and dvdnav.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29887 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-11-10 23:10:57 +00:00
Uoti Urpala d6c410b54c Replace libavutil internal header #includes with MPlayer copies
Change #include lines for libavutil/intreadwrite.h, libavutil/bswap.h
and libavutil/x86_cpu.h to use the MPlayer file under ffmpeg_files/
instead.
2009-07-26 06:16:43 +03:00
Uoti Urpala 0eb321bf2c Remove trailing whitespace from most files 2009-07-07 02:34:35 +03:00
Amar Takhar e306174952 Translation system changes part 2: replace macros by strings
Replace all MSGTR_ macros in the source by the corresponding English
string.
2009-07-07 01:38:20 +03:00
Amar Takhar b5972d6f14 Translation system changes part 1: wrap translated strings
Replace mp_msg() calls which have a translated string as the format
argument with mp_tmsg and add _() around all other translated strings.
2009-07-07 01:28:07 +03:00
diego 6e9cbdc104 whitespace cosmetics: Remove all trailing whitespace.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29305 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-05-13 02:58:57 +00:00
Uoti Urpala d136cf6882 Merge svn changes up to r29134 2009-04-02 23:55:13 +03:00
diego a38ca08ca0 Remove unused variable along with the related warning.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29122 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-04-01 16:27:03 +00:00
Uoti Urpala cf9edda1d3 Merge svn changes up to r29117 2009-04-01 02:43:47 +03:00
reimar f5d01796a8 100l, revert r29082, I missed that the vts comparison should be case-insensitive.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29084 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-03-28 16:09:56 +00:00
reimar 8d376de96f Reindent
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29083 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-03-28 15:54:08 +00:00
reimar df1af70475 Simplify extracting title number from ifo name
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29082 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-03-28 15:53:32 +00:00
reimar 8198495234 Simplify detection of .ifo extension.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29078 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-03-27 21:26:26 +00:00
Uoti Urpala 9bcd12fdf5 Merge svn changes up to r28310
The libdvdread4 and libdvdnav directories, which are externals in the
svn repository, are at least for now not included in any form. I added
configure checks to automatically disable internal libdvdread and
libdvdnav if the corresponding directories are not present; if they're
added manually then things work the same as in svn.
2009-01-15 05:57:31 +02:00
reimar 82d097d04b Fix DVD seek_to_chapter: the title number must be converted to a per-VTS
title number first. Also add a few out-of-bounds checks just in case.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28226 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-01-01 11:46:34 +00:00
reimar a2c2268cdf Work around a dvdread bug where DVDReadBlocks would return values < 0 on read error,
causing hangs e.g. when seeking to the very last chapter (which would read beyond the
size of the DVD).


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28216 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-12-31 14:21:50 +00:00
Uoti Urpala 0301309425 Merge svn changes up to 27824
Conflicts:
	cfg-common-opts.h
	libmpcodecs/dec_video.c
	libmpcodecs/vd.c
	libvo/x11_common.h
	mplayer.c
	stream/cache2.c
2008-10-25 05:12:34 +03:00
diego 6f6bf7f765 Replace typeof by __typeof__, the former is a non-portable GNU extension.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27807 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-10-20 09:55:38 +00:00
Uoti Urpala 849dc0ba31 Merge svn changes up to r27649
Conflicts:
	Makefile
	configure
	libvo/x11_common.c
2008-09-20 16:13:33 +03:00
diego 261e389fdd With -identify, ID_DVD_VOLUME_ID is not shown on some systems.
Using DVDISOVolumeInfo instead of DVDUDFVolumeInfo fixes this.
patch by Mathieu SCHROETER, mathieu.schroeter gamesover ch


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27631 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-09-16 21:30:04 +00:00
Uoti Urpala b56858342f Merge svn changes up to r27514 2008-09-03 10:16:30 +03:00
reimar fd75ca0c6a Print DVD volume ID with -identify.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27497 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-08-30 11:21:11 +00:00
Uoti Urpala f6dfaf26f8 Make various functions static 2008-08-12 14:57:12 +03:00
nicodvb b16d3fd6c2 in dvd streams the title part ranges from 1 to 99
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27267 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-07-12 08:07:54 +00:00
nicodvb efb1379f72 avoid unnecessary strdup(); patch by Aurel
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27226 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-07-06 18:04:14 +00:00
nicodvb a4b4b991dc cosmetics: in ifo_stream_oped() aligned the prototype to the style
of the rest of the file and renamed dvd_priv to spriv
(it's a stream_priv_s*, while dvd_priv is used for other
purposes in the rest of the file)


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27198 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-07-04 16:03:57 +00:00
nicodvb 8742c266db in ifo_stream_open() propagate the device based on the dirname of stream->url; patch by Mathieu SCHROETER mathieu.schroeter gamesover ch
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27197 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-07-04 16:00:07 +00:00
nicodvb 7043b6d0d1 dvd_device must be handled exclusively by the option parser; it can't be changed at will in ifo_stream_open()
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27196 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-07-04 15:57:33 +00:00
nicodvb 93b837f0a7 added support for the device part in the url; patch by
Mathieu SCHROETER mathieu.schroeter gamesover ch


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27195 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-07-04 15:54:45 +00:00
reimar 5560a0b358 Add basic support for stream controls with cache enabled.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26865 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-24 07:48:35 +00:00