diff options
| author |  wm4 <wm4@nowhere> | 2014-06-21 20:59:58 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2014-06-22 05:01:03 +0200 |
| commit | ea1650fcc338a11adfbbbf950719c65f33acc574 (patch) | |
| tree | 93c4a779567ad57545342ac6424d95eb0b0ceaf0 /stream | |
| parent | b443f8471fffdc16fe927acbf8e40f2061e412dc (diff) | |
stream: minor cleanups
Remove unused stream type constants. Move some now DVD specific crap
to stream_dvd.c.
Diffstat (limited to 'stream')
| -rw-r--r-- | stream/stream.h | 9 | ||||
| -rw-r--r-- | stream/stream_dvd.c | 7 | ||||
| -rw-r--r-- | stream/stream_pvr.c | 1 |
3 files changed, 7 insertions, 10 deletions
diff --git a/stream/stream.h b/stream/stream.h index fc8969d649..267f8e753a 100644 --- a/stream/stream.h +++ b/stream/stream.h @@ -32,11 +32,9 @@ enum streamtype { STREAMTYPE_GENERIC = 0, STREAMTYPE_FILE, - STREAMTYPE_RADIO, STREAMTYPE_DVB, STREAMTYPE_DVD, STREAMTYPE_BLURAY, - STREAMTYPE_PVR, STREAMTYPE_TV, STREAMTYPE_MF, STREAMTYPE_EDL, @@ -245,13 +243,6 @@ bool stream_check_interrupt(struct stream *s); bool stream_manages_timeline(stream_t *s); -typedef struct { - int id; // 0 - 31 mpeg; 128 - 159 ac3; 160 - 191 pcm - int language; - int type; - int channels; -} stream_language_t; - void mp_url_unescape_inplace(char *buf); char *mp_url_escape(void *talloc_ctx, const char *s, const char *ok); diff --git a/stream/stream_dvd.c b/stream/stream_dvd.c index 0e193db78a..2195189c42 100644 --- a/stream/stream_dvd.c +++ b/stream/stream_dvd.c @@ -65,6 +65,13 @@ #endif typedef struct { + int id; // 0 - 31 mpeg; 128 - 159 ac3; 160 - 191 pcm + int language; + int type; + int channels; +} stream_language_t; + +typedef struct { dvd_reader_t *dvd; dvd_file_t *title; ifo_handle_t *vmg_file; diff --git a/stream/stream_pvr.c b/stream/stream_pvr.c index 7fc521fa28..db355131b1 100644 --- a/stream/stream_pvr.c +++ b/stream/stream_pvr.c @@ -1609,7 +1609,6 @@ pvr_stream_open (stream_t *stream) } stream->priv = pvr; - stream->type = STREAMTYPE_PVR; stream->fill_buffer = pvr_stream_read; stream->close = pvr_stream_close; stream->control = pvr_stream_control; |