diff options
-rw-r--r-- | mplayer.c | 1 | ||||
-rw-r--r-- | vobsub.c | 19 | ||||
-rw-r--r-- | vobsub.h | 2 |
3 files changed, 21 insertions, 1 deletions
@@ -1039,6 +1039,7 @@ if(!use_stdin && !slave_mode){ if(vo_vobsub){ sub_auto=0; // don't do autosub for textsubs if vobsub found inited_flags|=INITED_VOBSUB; + vobsub_set_from_lang(vo_vobsub, dvdsub_lang); } //============ Open & Sync STREAM --- fork cache2 ==================== @@ -1151,6 +1151,25 @@ vobsub_get_id(void *vobhandle, unsigned int index) } int +vobsub_set_from_lang(void *vobhandle, unsigned char * lang) +{ + int i; + vobsub_t *vob= (vobsub_t *) vobhandle; + while(lang && strlen(lang) >= 2){ + for(i=0; i < vob->spu_streams_size; i++) + if (vob->spu_streams[i].id) + if ((strncmp(vob->spu_streams[i].id, lang, 2)==0)){ + vobsub_id=i; + mp_msg(MSGT_VOBSUB, MSGL_INFO, "Selected VOBSUB language: %d language: %s\n", i, vob->spu_streams[i].id); + return; + } + lang+=2;while (lang[0]==',' || lang[0]==' ') ++lang; + } + mp_msg(MSGT_VOBSUB, MSGL_WARN, "No matching VOBSUB languge found!\n"); + return -1; +} + +int vobsub_get_packet(void *vobhandle, float pts,void** data, int* timestamp) { vobsub_t *vob = (vobsub_t *)vobhandle; unsigned int pts100 = 90000 * pts; @@ -13,6 +13,6 @@ extern char *vobsub_get_id(void * /* vobhandle */, unsigned int /* index */); extern void *vobsub_out_open(const char *basename, const unsigned int *palette, unsigned int orig_width, unsigned int orig_height, const char *id, unsigned int index); extern void vobsub_out_output(void *me, const unsigned char *packet, int len, double pts); extern void vobsub_out_close(void *me); - +extern int vobsub_set_from_lang(void *vobhandle, unsigned char * lang); #endif /* MPLAYER_VOBSUB_H */ |