Commit Graph

28 Commits

Author SHA1 Message Date
wm4 e3c20bf350 stream: kill start_pos, remove --sb option
stream.start_pos was needed for optical media only, and (apparently) not
for very good reasons. Just get rid of it.

For stream_dvd, we don't need to do anything. Byte seeking was already
removed from it earlier.

For stream_cdda and stream_vcd, emulate the start_pos by offsetting the
stream pos as seen by the rest of mpv.

The bits in discnav.c and loadfile.c were for dealing with the code
seeking back to the start in demux.c. Handle this differently by
assuming the demuxer is always initialized with the stream at start
position, and instead seek back if initializing the demuxer fails.

Remove the --sb option, which worked by modifying stream.start_pos. If
someone really wants this option, it could be added back by creating a
"slice" stream (actually ffmpeg already has such a thing).
2014-05-24 16:17:50 +02:00
wm4 78128bddda Kill all tabs
I hate tabs.

This replaces all tabs in all source files with spaces. The only
exception is old-makefile. The replacement was made by running the
GNU coreutils "expand" command on every file. Since the replacement was
automatic, it's possible that some formatting was destroyed (but perhaps
only if it was assuming that the end of a tab does not correspond to
aligning the end to multiples of 8 spaces).
2014-04-13 18:03:01 +02:00
wm4 0335011f11 stream: mp_msg conversions
We also drop some slave mode stuff from stream_vcd.
2013-12-21 21:43:16 +01:00
wm4 0112143fda Split mpvcore/ into common/, misc/, bstr/ 2013-12-17 02:39:45 +01:00
Stefano Pigozzi 406241005e core: move contents to mpvcore (2/2)
Followup commit. Fixes all the files references.
2013-08-06 22:52:31 +02:00
wm4 2599729e96 stream: remove unused vcd functions
Gets rid of warnings.
2013-07-15 21:29:25 +02:00
wm4 4873b32c59 Rename directories, move files (step 2 of 2)
Finish renaming directories and moving files. Adjust all include
statements to make the previous commit compile.

The two commits are separate, because git is bad at tracking renames
and content changes at the same time.

Also take this as an opportunity to remove the separation between
"common" and "mplayer" sources in the Makefile. ("common" used to be
shared between mplayer and mencoder.)
2012-11-12 20:08:18 +01:00
reimar 8278977c0d cleanup: Make vcd_seek_to_track() static in more files
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33436 b3059339-0415-0410-9bf9-f77b7e298cf2
2011-06-29 09:26:00 +03:00
reimar d62bef6ee5 Try to fix VCD compilation on non-Linux systems.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31023 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-04-05 19:31:55 +00:00
diego 202fbbecdf Mark vcd_get_track_end () and vcd_read_toc() as static.
They are only used within the respective files.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30712 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-22 16:32:03 +00: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
diego 00ad5d3fed Add a few missing header #includes and #defines.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30207 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-04 18:58:35 +00: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
diego 5444ec53dc Add missing header #includes to fix 'make checkheaders'.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26218 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-03-10 20:19:15 +00:00
diego 87281a7d6a Add missing header #includes to fix 'make checkheaders'.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26216 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-03-10 19:28:42 +00:00
diego 8efb2fa21c Add MPLAYER_ prefix to multiple inclusion guards.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26061 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-02-22 09:09:46 +00:00
diego 878e9ef324 Add missing multiple inclusion guards.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26044 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-02-21 00:12:02 +00:00
ulion 43bfd2d128 Only read disc info once and save it for later using.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25406 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-12-15 13:24:01 +00:00
ulion 9c189c49bf The buffer used for pread need be aligned, but currently it got an offset 23
to the structure head. This will cause the pread always got random data
on some machines (such as my iMac G5 PPC with 10.5 os) so can not play vcd.
I also tried use DKIOCCDREAD ioctl call, but the result is same -- buffer need
be aligned. It could be a bug of os x or its dev lib.
Now fix this problem by move the buffer to a good aligned position in structure.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25404 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-12-15 12:17:51 +00:00
ulion 25a4519cd9 Get end position of last track by adding its starting address with track size.
On some darwin system, we can not get the lead out track info.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25403 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-12-15 12:11:44 +00:00
reimar ef750478b7 Simplify and fix missing offset for Darwin vcd_get/set_msf functions
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23918 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-07-29 15:59:55 +00:00
reimar 2ea3b5fdb0 Make VCD work on little-endian macs
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23916 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-07-29 15:37:30 +00:00
reimar 1c67c05e8c Make vcd_get_track_end actually return the end, not the start on Darwin
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23915 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-07-29 15:35:52 +00:00
reimar 5bcef8f16b Make the vcd seek and get track end functions actually have an effect
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23914 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-07-29 14:42:07 +00:00
reimar 0f4796adaa Fix wrong return type in darwin VCD code
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23911 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-07-29 12:41:22 +00:00
reimar b9c8b4fbcd Remove completely pointless extra return statements
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23883 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-07-27 19:25:51 +00:00
diego 5edd9af248 Remove some unused variables, patch by timwoj ieee org.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23399 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-05-28 08:42:35 +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