diff options
Diffstat (limited to 'stream')
| -rw-r--r-- | stream/cache.c | 10 | ||||
| -rw-r--r-- | stream/stream.h | 6 | ||||
| -rw-r--r-- | stream/stream_dvd.c | 8 |
3 files changed, 24 insertions, 0 deletions
diff --git a/stream/cache.c b/stream/cache.c index a0ad2559ae..9038fc6cf6 100644 --- a/stream/cache.c +++ b/stream/cache.c @@ -90,6 +90,7 @@ typedef struct { volatile uint64_t control_uint_arg; volatile double control_double_arg; volatile struct stream_lang_req control_lang_arg; + volatile struct stream_dvd_info_req control_dvd_info_arg; volatile int control_res; volatile double stream_time_length; volatile double stream_time_pos; @@ -352,6 +353,10 @@ static int cache_execute_control(cache_vars_t *s) s->control_res = s->stream->control(s->stream, s->control, (void *)&s->control_lang_arg); break; + case STREAM_CTRL_GET_DVD_INFO: + s->control_res = s->stream->control(s->stream, s->control, + (void *)&s->control_dvd_info_arg); + break; case STREAM_CTRL_MANAGES_TIMELINE: s->control_res = s->stream->control(s->stream, s->control, NULL); break; @@ -737,6 +742,8 @@ int cache_do_control(stream_t *stream, int cmd, void *arg) break; case STREAM_CTRL_GET_LANG: s->control_lang_arg = *(struct stream_lang_req *)arg; + case STREAM_CTRL_GET_DVD_INFO: + s->control_dvd_info_arg = *(struct stream_dvd_info_req *)arg; case STREAM_CTRL_GET_NUM_TITLES: case STREAM_CTRL_GET_NUM_CHAPTERS: case STREAM_CTRL_GET_CURRENT_TITLE: @@ -797,6 +804,9 @@ int cache_do_control(stream_t *stream, int cmd, void *arg) case STREAM_CTRL_GET_LANG: *(struct stream_lang_req *)arg = s->control_lang_arg; break; + case STREAM_CTRL_GET_DVD_INFO: + *(struct stream_dvd_info_req *)arg = s->control_dvd_info_arg; + break; case STREAM_CTRL_MANAGES_TIMELINE: break; } diff --git a/stream/stream.h b/stream/stream.h index e4a482f737..360f65e008 100644 --- a/stream/stream.h +++ b/stream/stream.h @@ -103,6 +103,7 @@ #define STREAM_CTRL_MANAGES_TIMELINE 19 #define STREAM_CTRL_GET_START_TIME 20 #define STREAM_CTRL_GET_CHAPTER_TIME 21 +#define STREAM_CTRL_GET_DVD_INFO 22 struct stream_lang_req { int type; // STREAM_AUDIO, STREAM_SUB @@ -110,6 +111,11 @@ struct stream_lang_req { char name[50]; }; +struct stream_dvd_info_req { + unsigned int palette[16]; + int num_subs; +}; + typedef enum { streaming_stopped_e, streaming_playing_e diff --git a/stream/stream_dvd.c b/stream/stream_dvd.c index aa113667fd..1a641de5cd 100644 --- a/stream/stream_dvd.c +++ b/stream/stream_dvd.c @@ -747,6 +747,14 @@ static int control(stream_t *stream,int cmd,void* arg) } case STREAM_CTRL_MANAGES_TIMELINE: return STREAM_OK; + case STREAM_CTRL_GET_DVD_INFO: + { + struct stream_dvd_info_req *req = arg; + memset(req, 0, sizeof(*req)); + req->num_subs = dvd_number_of_subs(stream); + memcpy(req->palette, d->cur_pgc->palette, sizeof(req->palette)); + return STREAM_OK; + } } return STREAM_UNSUPPORTED; } |