Commit Graph

185 Commits

Author SHA1 Message Date
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 186e5a998c Merge svn changes up to r28641
Convert vo_x11_border (used in vo_gl/gl2 though the vo_gl_border
macro) to use a wrapper macro in old-style VOs which do not provide a
VO object argument. Before this function had an explicit global_vo
argument in vo_gl/gl2. New vo_vdpau uses it too so use the same
mechanism as most other functions.
2009-02-18 01:45:36 +02:00
diego 1b915e419e Replace double semicolon by single semicolon.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28611 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-16 02:00:29 +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 ed0af8844a Determine default CD/DVD device in configure instead of using an #ifdef jungle.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27809 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-10-21 07:02:25 +00:00
diego 629db77d89 Move DEFAULT_CDROM_DEVICE/DEFAULT_DVD_DEVICE to stream.h where it belongs.
config.h should only contain option definitions, no logic.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27787 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-10-16 18:28:38 +00:00
Uoti Urpala 0d09176078 stream.h: Add 2 prototypes instead of declaring them in cache2.c
Declare stream_fill_buffer() and stream_seek_long() always (before
they were only declared if cache was disabled and those were used
instead of cached versions). Remove the now redundant declarations in
cache2.c.
2008-08-12 12:49:37 +03:00
Uoti Urpala 17d3e4b36d Merge svn changes up to r27441
Conflicts:

	cfg-common-opts.h
	command.c
	configure
	input/input.c
	libmpcodecs/dec_video.c
	libmpcodecs/vd.c
	libmpdemux/stheader.h
	libvo/sub.c
	libvo/video_out.c
	libvo/vo_xv.c
	libvo/vosub_vidix.c
	libvo/x11_common.c
	libvo/x11_common.h
	mp_core.h
	mplayer.c
	stream/stream.h
2008-08-08 02:13:09 +03:00
diego e0b1c9a6b7 Give a CONFIG_ prefix to preprocessor directives that lacked one and
change arbitrary prefixes to CONFIG_.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27429 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-08-07 12:20:50 +00:00
Uoti Urpala 04f3909a72 Merge svn changes up to r27374
Conflicts:

	cfg-common-opts.h
	cfg-mplayer.h
	command.c
	configure
	libmpcodecs/dec_video.c
	libmpcodecs/vd.c
	libmpcodecs/vf_vo.c
	libmpdemux/demuxer.h
	libmpdemux/stheader.h
	mp_core.h
	mplayer.c
	stream/stream_radio.c
2008-07-30 16:39:24 +03:00
diego 4b141479da Start unifying names of internal preprocessor directives.
Replace all USE_ prefixes by CONFIG_ prefixes to indicate
options which are configurable.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27373 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-07-30 12:01:30 +00:00
Uoti Urpala 9e9932d4d7 Create a context for input.c state
Start moving static variables to a context struct. Only autorepeat
state is moved to the struct in this commit.

mp_input_check_interrupt now requires the context variable. Change
stream functions to pass it. It's still stored in a static variable in
stream/.
2008-04-30 13:24:54 +03:00
Uoti Urpala 0e757bf9da Remove _s/_st suffix from some struct names
Since the names are always used after the keyword "struct" having a
suffix as in "struct demuxer_st" is almost completely pointless.
2008-04-25 03:34:22 +03:00
Uoti Urpala f518cf7ea9 Add option pointer to stream struct (at least temporarily)
The stream code does not access many option variables directly, but it
does access some such as audio_id and network_bandwidth (and does that
without including proper headers for them). Add option pointer to the
stream struct to allow access to those variables. Remove the unused
(always NULL) and clumsy-looking char** options parameter in the
open_stream call and replace it with the option pointer. The parameter
is currently only set in the main open_stream() call in MPlayer.c and
not in any other locations that can open a stream.

In the long term it might be better to pass a more limited set of
values somehow, but this should do for now.
2008-04-23 13:48:38 +03:00
albeu f481e7870b Remove the need for code using stream to export an mp_input_check_interrupt()
function. It also removes the compile-time dependency on input.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26358 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-09 00:36:28 +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
reimar 62b89eb60a stream_info_t opts and protocols point to constant data as well.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25718 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-13 12:09:29 +00:00
nicodvb 5baab7bbb8 NEW STREAM_CTRLs: STREAM_CTRL_GET_NUM_ANGLES STREAM_CTRL_GET_ANGLE STREAM_CTRL_SET_ANGLE
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25600 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-05 14:20:47 +00:00
diego 60fa2be5d7 consistency cosmetics
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25575 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-01 20:05:36 +00:00
ulion 0bb30d41b3 Support stream redirection from http to mms, fix bug #927.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25163 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-11-26 00:41:21 +00:00
nicodvb 818cc0cf0d introduced STREAM_CTRL_GET_ASPECT_RATIO to report the aspect ratio read from the stream layer (if supported)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24317 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-01 15:50:52 +00:00
diego 01d92a32ad cosmetics: typo fix UNSUPORTED --> UNSUPPORTED
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24277 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-08-28 22:38:45 +00:00
reimar 46afe7d1d2 Fix a bug in stream_read_qword_le due to sign extension from int to uint64_t.
Patch by Sean Veers [cf3cf3 gmail com]


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24099 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-08-19 08:50:58 +00:00
diego 3e9e4acd8d Do not use leading underscores in multiple inclusion guards, they are reserved.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23709 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-07-02 22:34:45 +00:00
diego 43cbd97f17 Fix live555 compilation when stream cache is disabled.
based on patch by Gianluigi Tiesi, mplayer netfarm it


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22558 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-03-13 23:35:00 +00:00
nicodvb 874627a371 new STREAM_CTRL_GET_SIZE to get size of output stream
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21673 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-18 20:54:38 +00:00
nicodvb 8bd29fd6c5 added member and definitions for output streams
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21671 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-18 20:50:31 +00:00
nicodvb f8bea9a082 added definitions of STREAM_CTRL_GET_CURRENT_TIME STREAM_CTRL_SEEK_TO_TIME
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20760 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-07 22:46:35 +00:00
reimar acf654cf8f Radio support, patch by Vladimir Voroshilov (voroshil gmail com)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19574 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-08-28 17:05:18 +00:00
nicodvb 28a6ef4591 added STREAM_CTRL_GET_NUM_CHAPTERS to get total number of chapters from the stream reader
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19481 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-08-21 19:10:18 +00:00
nicodvb d4a4bb3651 new stream_ctrl to get currently playing chapter (needed for stream-driven relative chapter seeking)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19443 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-08-18 18:58:38 +00:00
nicodvb 63fdcbc840 new STREAM_CTRL_SEEK_TO_CHAPTER (will be used by streams dvd[nav], maybe [s]vcd
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19440 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-08-18 16:44:24 +00:00
ben d844273899 added dedicated file for mf:// input
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19307 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-08-03 19:43:02 +00:00
ben 6eaeaa734e conversion from stream_null to stream_tv was missing stream type
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19301 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-08-03 19:12:31 +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