diff --git a/configure b/configure index adf35d2e53..f7793e4980 100755 --- a/configure +++ b/configure @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # # MPlayer configurator. (C) 2000 Pontscho/fresh!mindworkz diff --git a/debian/files b/debian/files index 24cc330b07..e71caa5ad0 100644 --- a/debian/files +++ b/debian/files @@ -1 +1 @@ -mplayer_0.17a-1_i386.deb unknown optional +mplayer_0.17a-2_i386.deb unknown optional diff --git a/debian/mplayer.conf b/debian/mplayer.conf index 32a80dab97..82efec6b6c 100644 --- a/debian/mplayer.conf +++ b/debian/mplayer.conf @@ -41,7 +41,6 @@ zoom=no # Enable software scaling (powerful CPU needed) ## sound = 1 -nosound = nein mixer = /dev/mixer master = no # no : set PCM volume yes : set MASTER volume @@ -83,7 +82,7 @@ ffactor = 1 # forcexv = yes # force XVideo even if not detected -# nodshow # disable usage of DirectShow video codecs +# nodshow = 1 # disable usage of DirectShow video codecs ## ## You can also include other configfiles diff --git a/subreader.c b/subreader.c index d0cb84567d..1a0c54cd03 100644 --- a/subreader.c +++ b/subreader.c @@ -24,6 +24,7 @@ int sub_format=-1; // 0 for microdvd // 2 for the third format (what's this?) // 3 for SAMI (smi) // 4 for vplayer format + // 5 for RT format int eol(char p) { return (p=='\r' || p=='\n' || p=='\0'); @@ -253,6 +254,46 @@ subtitle *sub_read_line_vplayer(FILE *fd,subtitle *current) { return current; } +subtitle *sub_read_line_rt(FILE *fd,subtitle *current) { + //TODO: This format uses quite rich (sub/super)set of xhtml + // I couldn't check it since DTD is not included. + // WARNING: full XML parses can be required for proper parsing + char line[1001]; + int a1,a2,a3,a4,b1,b2,b3,b4; + char *p=NULL,*next=NULL; + int i,len,plen; + + bzero (current, sizeof(current)); + + while (!current->text[0]) { + if (!fgets (line, 1000, fd)) return NULL; + //TODO: it seems that format of time is not easily determined, it may be 1:12, 1:12.0 or 0:1:12.0 + //to describe the same moment in time. Maybe there are even more formats in use. + //if ((len=sscanf (line, "