Commit Graph

2132 Commits

Author SHA1 Message Date
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