summaryrefslogtreecommitdiffstats
path: root/stream/stream.h
Commit message (Collapse)AuthorAgeFilesLines
* Merge svn changes up to r28641Uoti Urpala2009-02-181-1/+1
|\ | | | | | | | | | | | | | | 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.
| * Replace double semicolon by single semicolon.diego2009-02-161-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28611 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to 27824Uoti Urpala2008-10-251-0/+1
|\| | | | | | | | | | | | | | | | | | | Conflicts: cfg-common-opts.h libmpcodecs/dec_video.c libmpcodecs/vd.c libvo/x11_common.h mplayer.c stream/cache2.c
| * Determine default CD/DVD device in configure instead of using an #ifdef jungle.diego2008-10-211-26/+0
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27809 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Move DEFAULT_CDROM_DEVICE/DEFAULT_DVD_DEVICE to stream.h where it belongs.diego2008-10-161-0/+27
| | | | | | | | | | | | | | config.h should only contain option definitions, no logic. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27787 b3059339-0415-0410-9bf9-f77b7e298cf2
* | stream.h: Add 2 prototypes instead of declaring them in cache2.cUoti Urpala2008-08-121-2/+2
| | | | | | | | | | | | | | 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.
* | Merge svn changes up to r27441Uoti Urpala2008-08-081-2/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Give a CONFIG_ prefix to preprocessor directives that lacked one anddiego2008-08-071-2/+2
| | | | | | | | | | | | | | change arbitrary prefixes to CONFIG_. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27429 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r27374Uoti Urpala2008-07-301-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Start unifying names of internal preprocessor directives.diego2008-07-301-1/+1
| | | | | | | | | | | | | | | | 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
* | Create a context for input.c stateUoti Urpala2008-04-301-1/+3
| | | | | | | | | | | | | | | | | | 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/.
* | Remove _s/_st suffix from some struct namesUoti Urpala2008-04-251-8/+8
| | | | | | | | | | Since the names are always used after the keyword "struct" having a suffix as in "struct demuxer_st" is almost completely pointless.
* | Add option pointer to stream struct (at least temporarily)Uoti Urpala2008-04-231-3/+5
|/ | | | | | | | | | | | | | 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.
* Remove the need for code using stream to export an mp_input_check_interrupt()albeu2008-04-091-0/+5
| | | | | | | 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
* Add MPLAYER_ prefix to multiple inclusion guards.diego2008-02-221-3/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26061 b3059339-0415-0410-9bf9-f77b7e298cf2
* stream_info_t opts and protocols point to constant data as well.reimar2008-01-131-2/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25718 b3059339-0415-0410-9bf9-f77b7e298cf2
* NEW STREAM_CTRLs: STREAM_CTRL_GET_NUM_ANGLES STREAM_CTRL_GET_ANGLE ↵nicodvb2008-01-051-0/+3
| | | | | | STREAM_CTRL_SET_ANGLE git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25600 b3059339-0415-0410-9bf9-f77b7e298cf2
* consistency cosmeticsdiego2008-01-011-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25575 b3059339-0415-0410-9bf9-f77b7e298cf2
* Support stream redirection from http to mms, fix bug #927.ulion2007-11-261-0/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25163 b3059339-0415-0410-9bf9-f77b7e298cf2
* introduced STREAM_CTRL_GET_ASPECT_RATIO to report the aspect ratio read from ↵nicodvb2007-09-011-0/+1
| | | | | | the stream layer (if supported) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24317 b3059339-0415-0410-9bf9-f77b7e298cf2
* cosmetics: typo fix UNSUPORTED --> UNSUPPORTEDdiego2007-08-281-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24277 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix a bug in stream_read_qword_le due to sign extension from int to uint64_t.reimar2007-08-191-8/+2
| | | | | | | Patch by Sean Veers [cf3cf3 gmail com] git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24099 b3059339-0415-0410-9bf9-f77b7e298cf2
* Do not use leading underscores in multiple inclusion guards, they are reserved.diego2007-07-021-3/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23709 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix live555 compilation when stream cache is disabled.diego2007-03-131-0/+2
| | | | | | | based on patch by Gianluigi Tiesi, mplayer netfarm it git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22558 b3059339-0415-0410-9bf9-f77b7e298cf2
* new STREAM_CTRL_GET_SIZE to get size of output streamnicodvb2006-12-181-0/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21673 b3059339-0415-0410-9bf9-f77b7e298cf2
* added member and definitions for output streamsnicodvb2006-12-181-0/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21671 b3059339-0415-0410-9bf9-f77b7e298cf2
* added definitions of STREAM_CTRL_GET_CURRENT_TIME STREAM_CTRL_SEEK_TO_TIMEnicodvb2006-11-071-0/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20760 b3059339-0415-0410-9bf9-f77b7e298cf2
* Radio support, patch by Vladimir Voroshilov (voroshil gmail com)reimar2006-08-281-0/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19574 b3059339-0415-0410-9bf9-f77b7e298cf2
* added STREAM_CTRL_GET_NUM_CHAPTERS to get total number of chapters from the ↵nicodvb2006-08-211-0/+1
| | | | | | stream reader git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19481 b3059339-0415-0410-9bf9-f77b7e298cf2
* new stream_ctrl to get currently playing chapter (needed for stream-driven ↵nicodvb2006-08-181-0/+1
| | | | | | relative chapter seeking) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19443 b3059339-0415-0410-9bf9-f77b7e298cf2
* new STREAM_CTRL_SEEK_TO_CHAPTER (will be used by streams dvd[nav], maybe [s]vcdnicodvb2006-08-181-0/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19440 b3059339-0415-0410-9bf9-f77b7e298cf2
* added dedicated file for mf:// inputben2006-08-031-0/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19307 b3059339-0415-0410-9bf9-f77b7e298cf2
* conversion from stream_null to stream_tv was missing stream typeben2006-08-031-0/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19301 b3059339-0415-0410-9bf9-f77b7e298cf2
* introduce new 'stream' directory for all stream layer related components and ↵ben2006-07-311-0/+301
split them from libmpdemux git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19277 b3059339-0415-0410-9bf9-f77b7e298cf2