RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-02-23 16:36:56 +00:00
Code Issues Releases Wiki Activity
33,148 Commits 42 Branches 86 Tags 174 MiB
2e1cdcb9e6
Commit Graph

1175 Commits

Author SHA1 Message Date
reimar
5544c07aab cache: Use sigaction() instead of signal() 
Signal() has an unavoidable race-condition on "broken by
backwards-compatibility" systems like Solaris. (Upon receiving a
signal, the handler is reset to SIG_DFL, thus a second signal will
kill the process. The problem could also be reduced by re-installing
the handler inside the handler, but there's still a race-condition and
the risk of the handler being called inside the handler).

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31738 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-11-02 04:14:44 +02:00
reimar
8200a8d532 stream.c: add <libavutil/common.h> include needed for GET_UTF16 
Patch by Erik Auerswald {auerswal unix-ag.uni-kl.de}

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31658 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-11-02 04:14:35 +02:00
ben
4662ea6409 stream_bluray: implement slave mode compatible controls 
Added stream controls: get/set for chapters and angles.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31640 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-11-02 04:14:20 +02:00
ben
6704008a46 stream_bluray: add unencrypted Blu-ray playback 
Support for unencrypted Blu-ray playback through libbluray.
Use it through: mplayer br:////path/to/disc

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31631 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-11-02 04:14:20 +02:00
diego
a1b8092c87 Factorize MPlayer/MEncoder version string handling. 
The string now resides in a central object file instead of
being duplicated in every file that requires a version string.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31577 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-11-02 04:11:43 +02:00
reimar
41d25ebcc8 stream: Use MSG_NOSIGNAL flag if available for send(). 
This avoids MPlayer quitting due to SIGPIPE at least for these cases.
Ignoring SIGPIPE in general would break window-closing with some
window-managers.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31566 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-11-02 04:11:43 +02:00
diego
262dde35ff stream/dvbin.h: Use angular brackets for system #includes. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31516 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-11-02 04:11:07 +02:00
diego
322fecd8de stream_cddb: move structs to the file they're used in 
Move cddb_data_t and cd_toc_t structs to the only place they are used.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31514 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-11-02 04:11:07 +02:00
diego
5a9c26af59 stream_cdda: change printf format for cdda_tracks to %d 
Adjust printf length modifier, fixes the warning:
stream/stream_cdda.c:358: warning: format '%ld' expects type 'long int', but argument 4 has type 'int'

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31512 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-11-02 04:11:07 +02:00
diego
899caa91f1 stream_cdda.c: Reorder functions to avoid forward declarations. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31511 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-11-02 04:11:07 +02:00
diego
f07956632e stream_cdd*: Move declarations for stream_cddb.c functions to cdd.h 
This fixes a bunch of warnings about missing function prototypes.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31509 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-11-02 04:11:07 +02:00
diego
5be8d4d633 stream_cddb: Remove unused static functions 
Remove unused static function cddb_get_freedb_sites(), fixes the warning:
stream/stream_cddb.c:747: warning: 'cddb_get_freedb_sites' defined but not used

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

Remove unused static function cddb_freedb_sites_parse().

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31510 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-11-02 04:11:07 +02:00
diego
2a6b09a3d4 stream_ccda: Move cdda_priv structure to the only place it is used 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31506 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-11-02 04:11:07 +02:00
attila
2957d89083 stream/tcp.c: Prefer the use of inet_ntop over inet_ntoa 
inet_ntop is ipv6 safe.
This fixes bug #1491.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31498 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-11-02 04:11:07 +02:00
reimar
27408d4f14 stream.h: support backswards stream_skip() within buffer 
Never just ignore a backwards skip, even if the stream is not seekable
it might still be in a buffer.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31465 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-11-02 04:11:07 +02:00
reimar
7bc5b0253f tv.h: Change function pointer types to proper declarations 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31388 b3059339-0415-0410-9bf9-f77b7e298cf2

Note that the code is still questionable after this commit - the
shared data structure has pointers to "struct priv", but different
files use different incompatible definitions for that struct.
 2010-11-02 04:07:42 +02:00
reimar
93891d0880 cache: Respect -cache-seek-min also for on-disk files 
Should reduce issues with mp4/mov (playing those may involve a lot of
seeking inside the file).

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31371 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-11-02 04:07:42 +02:00
Uoti Urpala
497c32cdad Merge svn changes up to r31291 2010-06-02 18:55:18 +03:00
Uoti Urpala
2120eb5998 stream_radio.c: fix corrupt line from e3061749 2010-06-02 00:27:01 +03:00
reimar
326ec00733 Add a referrer option to set the HTTP Referer field. 
Patch by chocolateboy [chocolate cpan org]


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31288 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-05-30 16:50:02 +00:00
Uoti Urpala
0e0d88ede9 Merge svn changes up to r31256 2010-05-30 16:39:41 +03:00
Uoti Urpala
688c66a5d5 Merge svn changes up to r31244 2010-05-30 16:29:14 +03:00
Uoti Urpala
8ce2c41ca5 Merge svn changes up to r31226 2010-05-30 16:25:04 +03:00
Uoti Urpala
2f1a518d45 Merge svn changes up to r31211 
The merged cache2.c changes are known to have problems. Will merge
further fixes to them before merging this to the master branch.
 2010-05-30 16:14:55 +03: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
diego
bce7550929 misc cosmetics: K&R style nits, #include placement, indentation 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31263 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-05-29 10:13:39 +00:00
reimar
a564c5a6cc Fix typo in message. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31256 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-05-28 20:59:53 +00:00
reimar
6b255e5083 stream_check_interrupt should sleep even if no callback is set. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31255 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-05-28 18:49:02 +00:00
reimar
27d41fa5b3 100l, stream_check_for_interrupt argument is not in usec, 
so we would end up sleeping for 10s instead of 10ms.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31254 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-05-28 18:47:03 +00:00
reimar
16e3978e1e Document time scale for stream_check_interrupt argument. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31253 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-05-28 18:45:25 +00:00
reimar
6f7c1ea409 Improve handling of cache process/thread hanging/being killed. 
In particular allow a single STRG+C to quit MPlayer.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31251 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-05-28 17:26:31 +00:00
reimar
4448190ef0 Fix cache process accidentally being killed by SIGUSR1. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31250 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-05-28 16:57:16 +00:00
diego
ae85fe1d2f Fix a bunch of typos in the stream cache code. 
patch by Giorgio Vazzana, mywing81 gmail com


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31242 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-05-27 22:18:10 +00:00
diego
5e71e43bb5 Drop pointless _st suffix from 'struct stream'. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31237 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-05-27 20:38:25 +00:00
reimar
c36de0867f Retry reading even if we hit eof before. 
This allows playing growing files even with a large cache.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31226 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-05-26 18:23:43 +00:00
reimar
328306708f Re-enable wakeup-on-signal for cache process. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31224 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-05-26 17:56:11 +00:00
reimar
d304c1d56c Disable waking the cache process up via a signal, it 
currently causes read errors due to not handling EINTR.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31223 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-05-26 17:27:38 +00:00
hyc
3c1cedaa56 Add support for STREAM_CTRL_SEEK_TO_TIME in ffmpeg streams 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31218 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-05-25 23:07:28 +00:00
reimar
8e84b9288c Slightly reduce number of #ifs 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31204 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-05-23 22:26:10 +00:00
reimar
bc2adc2e48 Use an extra define to simplify ifdefs 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31203 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-05-23 22:09:40 +00:00
reimar
991b9b9e6d Try reducing the #ifdef mess for the different cache variants. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31202 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-05-23 22:04:01 +00:00
reimar
939df8d5a8 Extract the cache main loop into a separate function. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31201 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-05-23 21:58:50 +00:00
reimar
2ced41082c Optimize cache behaviour for the many-consecutive-seeks case. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31199 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-05-23 21:53:48 +00:00
reimar
cc7a2d3287 Add code to wake up cache process when e.g. a seek is needed. 
Dramatically reduces seeking times with lavf ogg demuxer.
Needs a spearate implementation for the thread-based cache implementation.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31198 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-05-23 19:49:28 +00:00
Uoti Urpala
de5566f0b5 stream.h: remove bad EOF check in stream_seek() 
Also remove a redundant stream->eof = 0 in demuxer.c.
 2010-05-22 06:40:34 +03:00
Uoti Urpala
7795726e0f Merge svn changes up to r31033 2010-04-26 18:25:34 +03:00
Uoti Urpala
837c48ddee Merge svn changes up to r31020 2010-04-26 18:06:00 +03:00
Uoti Urpala
e913d6c5da Merge svn changes up to r31004 2010-04-26 17:55:05 +03:00
Uoti Urpala
4785c2617e Merge svn changes up to r30967 2010-04-26 17:42:20 +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
7be5f14c3a demux_lavf, stream_ffmpeg: support librtmp seeks 2010-04-23 23:50:34 +03:00
Uoti Urpala
1d4d1bff82 stream_ffmpeg, demux_lavf: Use flv demuxer for rtmp streams 
Use lavf's flv demuxer for rtmp/rtmps/... stream types. Letting
generic format probing handle this could work, but with the current
probing implementation it'd at least depend on not-really-guaranteed
details of the stream layer (probing different formats and then
decoding depends on seeking back in between; rtmp streams don't
support such seeking directly so would need to rely on details of
caching behavior).
 2010-04-23 22:57:25 +03:00
Uoti Urpala
eb48fefe94 stream_ffmpeg.c: change reads back to url_read_complete() 
Change reading data from FFmpeg from url_read() back to
url_read_complete(). url_read_complete() behavior has changed in
FFmpeg and no longer returns an error for partial reads at EOF so it's
usable now. Using it is probably not significantly better than
url_read(), but at least it handles EAGAIN.
 2010-04-23 21:19:50 +03:00
reimar
7e8bfbef4b Do not print the "Loading cookie file" message twice. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31024 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-04-05 19:35:35 +00: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
reimar
9521c190c3 Export VCD tracks as chapters, just like for cue:// URLs. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31019 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-04-05 16:40:04 +00:00
diego
c7cdd996f5 Remove commented-out #include of a non-existing file. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30992 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-04-03 14:40:08 +00:00
reimar
fd6ce85192 Change type to uint8_t to avoid checks depending on char signedness. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30983 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-04-02 07:14:21 +00:00
reimar
006c481c1e Sanitize ICY metadata a bit before printing it. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30980 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-03-31 19:42:15 +00:00
reimar
f76e141402 Make http_read_response fail if parsing the response failed. 
Avoids possible crashes since other code assumes http_hdr->protocol
is a valid string if it succeeds.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30951 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-03-23 19:45:33 +00:00
diego
70c66c0476 Rename get_path.[ch] --> path.[ch]. 
These files now contain different functions related to path handling.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30943 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-03-20 23:38:27 +00: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
0269d22d32 Merge svn changes up to r30876 2010-03-10 03:18:42 +02:00
Uoti Urpala
240550bbb9 Merge svn changes up to r30848 2010-03-10 03:00:14 +02:00
Uoti Urpala
4857965118 Merge svn changes up to r30815 2010-03-10 02:36:35 +02:00
Uoti Urpala
bc1d0ca37d Merge svn changes up to r30798 2010-03-10 02:35:02 +02:00
Uoti Urpala
e74708f619 Merge svn changes up to r30748 2010-03-10 01:50:55 +02:00
Uoti Urpala
acdce0176a Merge svn changes up to r30732 2010-03-10 01:25:15 +02:00
Uoti Urpala
194efde18f Merge svn changes up to r30702 2010-03-10 01:08:50 +02:00
Uoti Urpala
0dce155dd3 Merge svn changes up to r30694 2010-03-10 01:01:15 +02:00
Uoti Urpala
327463be52 Merge svn changes up to r30672 2010-03-10 00:34:16 +02:00
Uoti Urpala
13221a7165 Merge svn changes up to r30663 
Conflicts:
	gui/cfg.c
	libmpcodecs/vd_dmo.c
	mplayer.c
 2010-03-10 00:13:11 +02:00
Uoti Urpala
8e593f5a34 Merge svn changes up to r30529 2010-03-09 22:47:41 +02:00
Uoti Urpala
bc0f524909 Merge svn changes up to r30502 
Conflicts:
	libswscale/rgb2rgb.c
	libswscale/rgb2rgb.h
	libswscale/swscale.c
	libvo/x11_common.c
 2010-03-09 19:44:28 +02:00
Uoti Urpala
12d3caebc7 Merge svn changes up to r30475 2010-03-09 19:18:43 +02:00
Uoti Urpala
b34a88e4f4 translations: tweak cases that relied on concatenating adjacent strings 
Tweak some code parts that used to rely on string literals from
translation macros being concatenated with other adjacent string
literals. Break up the resulting string into independently translated
parts, so that the existing translations for those parts can still be
used.
 2010-03-07 21:35:23 +02:00
Uoti Urpala
5234c72e28 Restore collapsed whitespace in output messages 
For some reason commit e306174952, which
replaced translation macro names with the corresponding English
strings, also collapsed multiple consecutive space characters into
one. Change most of these back. In a couple of cases the amount of
whitespace is important for alignment, and for the rest it at least
keeps the strings closer to the existing translations.
 2010-03-07 21:34:54 +02:00
komh
dd491c0d28 Define O_BINARY in stream/stream.h unless it is defined yet, and use it 
in other places.

This removes platform specific checks and prevents repeated definitions
of O_BINARY.



git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30850 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-03-06 07:24:41 +00:00
komh
b10a6917f4 Define HAVE_SETMODE conditionally, and use it in stream/stream_file.c instead 
of platform specific predefined macros.



git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30829 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-03-04 14:46:44 +00:00
komh
9beeeb1a9e Add a VCD support for OS/2 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30819 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-03-03 14:32:29 +00:00
diego
c106fe7751 Drop support for old-style DVB code. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30818 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-03-02 19:57:17 +00:00
reimar
be23797ee7 Remove unused and useless define. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30815 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-03-01 21:09:17 +00:00
reimar
3fa6717fb9 Fix memleak due to strdup'd filename not being freed. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30814 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-03-01 20:38:33 +00:00
reimar
cd4aa2aa30 Move functions into proper order to avoid extra declarations. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30813 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-03-01 20:33:47 +00:00
reimar
3ed38bacc4 Deduplicate code to set stream start_pos/end_pos. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30812 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-03-01 20:31:56 +00:00
reimar
4b7c452ce8 Set stream->pos correctly after seeking to a VCD title. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30811 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-03-01 20:22:18 +00:00
reimar
ea139fadc1 Ensure that cue_current_pos.track is not set to an invalid value after 
attempting to seek to e.g. track 0.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30810 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-03-01 20:20:13 +00:00
reimar
20fcc5c6ef Fix off-by-one error in chapter<->VCD track conversion. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30809 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-03-01 20:11:11 +00:00
reimar
4464a64ff7 Fix cue_read_toc_entry to also reject negative track numbers 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30808 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-03-01 20:07:37 +00:00
reimar
686565165f Implement cue:// track switching via chapter forward/backward like for audio CDs. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30807 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-03-01 19:59:54 +00:00
reimar
592af7cd2c Fix cue_vcd_get_track_end to not change the current position. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30806 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-03-01 19:57:42 +00:00
reimar
f2740450d3 Avoid fd_bin and fd_cue global variables. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30805 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-03-01 19:35:18 +00:00
reimar
3fc8335a86 Avoid a global variable and a strcpy. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30804 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-03-01 19:25:52 +00:00
reimar
2b91c7f044 Reindent. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30803 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-03-01 19:21:59 +00:00
reimar
2a6755e10d Avoid code duplication and excessively deep nesting in cue_find_bin 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30802 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-03-01 19:20:32 +00:00
reimar
7d48f09b39 Use sizeof instead of hardcoded size. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30801 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-03-01 18:57:24 +00:00
reimar
b20e08ed94 Extend stream_read_line to support reading lines from UTF-16 encoded files 
and use this to support reading UTF-16 encoded subtitle files in subreader.c


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30799 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-02-28 15:24:30 +00:00
reimar
c89169f7b5 Move stream_read_line implementation from stream.h to stream.c, 
it is not speed critical and the function call overhead is not
relevant for its overall speed anyway.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30796 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-02-28 13:54:55 +00:00
reimar
d8c02c2dd2 Simplify handling of 0-termination in stream_read_line 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30795 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-02-28 12:54:12 +00:00
reimar
2c8d69f185 Remove useless cast. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30794 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-02-28 11:30:35 +00:00
komh
35fbd55c0f Add cddb:// support for OS/2 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30788 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-02-28 03:26:18 +00:00
cehoyos
d59123f10d Fix warning "missing braces around initializer". 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30782 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-02-27 23:23:34 +00:00
cehoyos
70b070baa2 Remove unused functions. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30781 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-02-27 23:14:44 +00:00
cehoyos
d1b81c6c1c Fix cd_info_new() prototype. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30775 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-02-27 21:32:33 +00:00
reimar
827df51f1d Threaded cache fixes: do not free the stream_t struct twice on windows 
and make sure the cache thread quits also for streams without a control
function (e.g. http).


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30773 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-02-27 21:02:44 +00:00
cehoyos
f47d90850d Remove unused static function streaming_stop(). 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30765 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-02-27 20:13:21 +00:00
reimar
50fed7d1f9 Restructure #ifs to be clearer, also ensures that we return from the thread 
proc instead of calling exit() on __MINGW32__.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30754 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-02-27 06:17:14 +00:00
diego
b63759b175 Do not cast the results of malloc/calloc/realloc. 
These functions return void*, which is compatible with any pointer,
so there is no need for casts.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30744 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-02-26 15:01:37 +00:00
reimar
72d18a204f Mark stream open filename parameter as const, the filename string is not 
modified by these functions.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30739 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-02-25 22:47:04 +00:00
reimar
b99077dc4c Remove unused function declaration. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30736 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-02-25 22:29:00 +00:00
reimar
e522920697 Make local-only cddb functions static. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30735 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-02-25 22:27:53 +00:00
reimar
bdf546c7c6 Remove declarations of functions now already declared in stream.h 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30733 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-02-25 22:19:32 +00:00
komh
16d8b08089 Define O_BINARY if it is undefined. 
This removes a platform check for open().



git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30727 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-02-25 09:09:57 +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
c8a6c6385b Declare functions from network.c in network.h. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30698 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-02-22 13:50:48 +00:00
diego
638b2af889 Move struct streaming_control from network.h to stream.h, where it is used. 
This will help in declaring some public functions where they really belong.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30697 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-02-22 13:27:58 +00:00
diego
3784d4f992 Remove commented-out declaration of non-existing function streaming_start. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30696 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-02-22 10:14:00 +00:00
diego
f9c2ab17af Declare stream_fill_buffer() and stream_seek_long() unconditionally. 
They are public functions that are unconditionally compiled, so they
should not be declared conditionally.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30691 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-02-21 23:30:34 +00:00
diego
326397d815 Add header for asf_mmst_streaming_start() instead of forward declaring it. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30690 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-02-21 23:26:16 +00:00
diego
49b8b80199 Add header for exported DVB-related functions. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30688 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-02-21 21:00:08 +00:00
diego
d86a237bdd cosmetics: Move functions around to avoid forward declarations and #ifdefs. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30687 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-02-21 20:39:49 +00:00
diego
8ba6b4eaf9 cosmetics: Remove pointless empty lines at EOF. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30675 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-02-20 21:02:49 +00:00
diego
d393029ce2 cosmetics: K&R coding style, indent with 4 spaces, no tabs 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30671 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-02-20 19:57:47 +00:00
reimar
b1e549d7bc Print response headers as debugging output also for HTTP seeks. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30670 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-02-20 19:23:14 +00:00
reimar
4b36e2fd18 10l, fix a close() that should be a closesocket() 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30669 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-02-20 19:22:23 +00:00
reimar
9554a844e9 Do not discard stream buffer on eof, instead reuse it to slightly improve 
format autodetection with -nocache and non-seekable streams.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30668 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-02-20 18:53:07 +00:00
reimar
908f8c91e7 Replace misuse of stream_reset to set stream pos to 0 by more appropriate code. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30667 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-02-20 18:39:26 +00:00
reimar
bb54613ac1 Fix mov reference files: for video/quicktime mime do not force a demuxer 
but do autodetection. This tries lavf first but will also try native demuxer
for reference files where open fails for the lavf demuxer.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30663 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-02-20 11:48:41 +00:00
reimar
74b5e8b68a Make sure we do not try to use IPv6 with winsock2, we end up connecting 
to random addresses, causing huge delays.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30661 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-02-20 11:13:01 +00:00
diego
ca81202840 Add dvd_parse_chapter_range() to stream_dvd.h instead of forward declaring it. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30657 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-02-19 19:38:53 +00:00
komh
c9cf9649cf Add missing 'defined' for __bsdi__. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30655 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-02-19 13:40:04 +00:00
diego
d306b727b1 Remove pointless '#if 1' preprocessor directives. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30654 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-02-19 10:22:29 +00:00
komh
316e05b877 Replace platform preprocessor check by HAVE_DOS_PATHS. 
This is both more elegant and more portable.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30650 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-02-19 09:14:01 +00:00
komh
9216c6376a Remove useless CONFIG_SETLOCALE 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30649 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-02-19 09:12:23 +00:00
diego
2c8f5fa622 stream: Mark functions not used outside of their files as static. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30599 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-02-16 16:32:38 +00:00
reimar
de41d79d2c Prefer libavformat over our own mov demuxer also for video/quicktime 
mime-type.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30517 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-02-05 17:35:48 +00:00
reimar
9d9b7a1e22 Reindent 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30499 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-02-03 22:33:35 +00:00
reimar
8613396aa0 Add support for FFmpeg's rtsp dummy URL-with-pseudo-demuxer scheme. 
ffmpeg://rtsp://... will play a rtsp stream via FFmpeg.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30498 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-02-03 22:32:48 +00:00
reimar
d97ee3033d Fix argument order for lseek, fixes cookie loading in Windows and in general 
everywhere where SEEK_SET != 0.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30496 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-02-03 17:50:18 +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
12abc254d5 stream/rtp.h appears not to originate from dvbstream. 
In any case it is completely trivial and non-copyrightable.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30465 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-01-30 21:38:05 +00:00
Uoti Urpala
e28e4a1b15 Merge svn changes up to r30419 2010-01-25 15:59:53 +02:00
Uoti Urpala
4ebf007580 Merge svn changes up to r30375 2010-01-25 15:36:38 +02:00
Uoti Urpala
69fe2522f8 Merge svn changes up to r30301 2010-01-25 15:07:30 +02:00
reimar
4b2e107710 Fix ftp support to properly support large files > 2GB. 
Patch by Yuriy Kaminskiy [yumkam mail ru]


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30418 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-01-24 10:13:33 +00:00
reimar
570f1f5dec Always call cache_uninit to immediately free everything cache-related if we 
fail to enable the cache.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30404 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-01-23 12:27:13 +00:00
reimar
73dea88956 Call cache-uninit unconditionally, it should always be safe to call. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30403 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-01-23 12:21:07 +00:00
reimar
4e28b4bc9e Change code to allow playing a stream even if enabling the cache failed 
while still handling it when the user aborts the cache fill.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30402 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-01-23 12:13:28 +00:00
reimar
0e86058912 Make cache_init static, it is not used outside this file 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30401 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-01-23 11:51:13 +00:00
reimar
03af209bf7 Handle Content-Length also when Content-Type is not set. 
Based on patch by Yuriy Kaminskiy [yumkam mail ru]


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30399 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-01-23 11:14:18 +00:00