diff options
| author | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-04-23 06:35:36 +0300 |
|---|---|---|
| committer | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-04-23 13:48:38 +0300 |
| commit | f518cf7ea99e9282508f551ecb43892f6aabcbc4 (patch) | |
| tree | 76c85c7cdbb4d1e10679faf86c4bf8336598d6bc /stream/open.c | |
| parent | 9e7dfe3fa34ca05fb63cd34369f7c847b777516d (diff) | |
| download | mpv-f518cf7ea99e9282508f551ecb43892f6aabcbc4.tar.bz2 mpv-f518cf7ea99e9282508f551ecb43892f6aabcbc4.tar.xz | |
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.
Diffstat (limited to 'stream/open.c')
| -rw-r--r-- | stream/open.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/stream/open.c b/stream/open.c index 0ec0222c32..dad7c49db7 100644 --- a/stream/open.c +++ b/stream/open.c @@ -30,7 +30,8 @@ int dvd_title=0; // Open a new stream (stdin/file/vcd/url) -stream_t* open_stream(char* filename,char** options, int* file_format){ +stream_t* open_stream(char* filename, struct MPOpts *options, int* file_format) +{ // Check if playlist or unknown if (*file_format != DEMUXER_TYPE_PLAYLIST){ *file_format=DEMUXER_TYPE_UNKNOWN; |