From 35568f84f3170085eccddd82845c5cffc6f7ec7c Mon Sep 17 00:00:00 2001 From: wm4 Date: Wed, 1 May 2013 22:31:05 +0200 Subject: stream: remove unused new_ds_stream() --- stream/stream.c | 11 ----------- stream/stream.h | 2 -- 2 files changed, 13 deletions(-) (limited to 'stream') diff --git a/stream/stream.c b/stream/stream.c index 75c7d4fb5c..8e38d1983e 100644 --- a/stream/stream.c +++ b/stream/stream.c @@ -331,10 +331,6 @@ int stream_read_internal(stream_t *s, void *buf, int len) len = read(s->fd, buf, len); } break; - case STREAMTYPE_DS: - len = demux_read_data((demux_stream_t *)s->priv, buf, len); - break; - default: len = s->fill_buffer ? s->fill_buffer(s, buf, len) : 0; @@ -590,13 +586,6 @@ void free_stream(stream_t *s) talloc_free(s); } -stream_t *new_ds_stream(demux_stream_t *ds) -{ - stream_t *s = new_stream(-1, STREAMTYPE_DS); - s->priv = ds; - return s; -} - void stream_set_interrupt_callback(int (*cb)(struct input_ctx *, int), struct input_ctx *ctx) { diff --git a/stream/stream.h b/stream/stream.h index fb3d08097f..c47452aeb9 100644 --- a/stream/stream.h +++ b/stream/stream.h @@ -42,7 +42,6 @@ #define STREAMTYPE_DVD 3 // libdvdread #define STREAMTYPE_MEMORY 4 // read data from memory area #define STREAMTYPE_PLAYLIST 6 // FIXME!!! same as STREAMTYPE_FILE now -#define STREAMTYPE_DS 8 // read from a demuxer stream #define STREAMTYPE_CDDA 10 // raw audio CD reader #define STREAMTYPE_SMB 11 // smb:// url, using libsmbclient (samba) #define STREAMTYPE_VCDBINCUE 12 // vcd directly from bin/cue files @@ -393,7 +392,6 @@ stream_t *open_stream(const char *filename, struct MPOpts *options, int *file_format); stream_t *open_output_stream(const char *filename, struct MPOpts *options); struct demux_stream; -struct stream *new_ds_stream(struct demux_stream *ds); /// Set the callback to be used by libstream to check for user /// interruption during long blocking operations (cache filling, etc). -- cgit v1.2.3