RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

stream: minor cleanups 

Remove unused stream type constants. Move some now DVD specific crap
to stream_dvd.c.
This commit is contained in:
wm4 2014-06-21 20:59:58 +02:00
parent b443f8471f
commit ea1650fcc3
3 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
stream/stream.h
View File

@ -32,11 +32,9 @@
enum streamtype { enum streamtype {
STREAMTYPE_GENERIC = 0, STREAMTYPE_GENERIC = 0,
STREAMTYPE_FILE, STREAMTYPE_FILE,
STREAMTYPE_RADIO,
STREAMTYPE_DVB, STREAMTYPE_DVB,
STREAMTYPE_DVD, STREAMTYPE_DVD,
STREAMTYPE_BLURAY, STREAMTYPE_BLURAY,
STREAMTYPE_PVR,
STREAMTYPE_TV, STREAMTYPE_TV,
STREAMTYPE_MF, STREAMTYPE_MF,
STREAMTYPE_EDL, STREAMTYPE_EDL,
@ -245,13 +243,6 @@ bool stream_check_interrupt(struct stream *s);
bool stream_manages_timeline(stream_t *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); void mp_url_unescape_inplace(char *buf);
char *mp_url_escape(void *talloc_ctx, const char *s, const char *ok); char *mp_url_escape(void *talloc_ctx, const char *s, const char *ok);

7
stream/stream_dvd.c
View File

@ -64,6 +64,13 @@
#endif #endif
#endif #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 { typedef struct {
dvd_reader_t *dvd; dvd_reader_t *dvd;
dvd_file_t *title; dvd_file_t *title;

1
stream/stream_pvr.c
View File

@ -1609,7 +1609,6 @@ pvr_stream_open (stream_t *stream)
} }
stream->priv = pvr; stream->priv = pvr;
stream->type = STREAMTYPE_PVR;
stream->fill_buffer = pvr_stream_read; stream->fill_buffer = pvr_stream_read;
stream->close = pvr_stream_close; stream->close = pvr_stream_close;
stream->control = pvr_stream_control; stream->control = pvr_stream_control;