Mercurial > mplayer.hg
view mp3lib/mp3.h @ 34757:da38eb1e2069
subassconvert: handle "\r\n" line ends
Previously the code converting text subtitles to ASS format converted newline
characters, and only those, to ASS "new line" markup. If the subtitles
contained "\r\n", the "\r" was thus left in the text. In previous libass
versions the "\r" was not visible, but in the current one it produces an empty
box. Improve the conversion to remove the "\r" in that case. Also treat a lone
"\r" as a newline.
Picked from mplayer2/3e0a2705
author | cboesch |
---|---|
date | Sat, 07 Apr 2012 11:17:09 +0000 |
parents | 257ef2adfd66 |
children |
line wrap: on
line source
/* MP3 Player Library 2.0 (C) 1999 A'rpi/Astral&ESP-team */ #ifndef MPLAYER_MP3LIB_MP3_H #define MPLAYER_MP3LIB_MP3_H /* decoder level: */ #ifdef CONFIG_FAKE_MONO void MP3_Init(int fakemono); #else void MP3_Init(void); #endif int MP3_Open(char *filename, int buffsize); void MP3_SeekFrame(int num, int dir); void MP3_SeekForward(int num); int MP3_PrintTAG(void); int MP3_DecodeFrame(unsigned char *hova, short single); int MP3_FillBuffers(void); void MP3_PrintHeader(void); void MP3_Close(void); /* public variables: */ extern int MP3_eof; // set if EOF reached extern int MP3_pause; // lock playing /* informational: */ extern int MP3_filesize; // filesize extern int MP3_frames; // current frame no extern int MP3_fpos; // current file pos extern int MP3_framesize; // current framesize in bytes (including header) extern int MP3_bitrate; // current bitrate (kbits) extern int MP3_samplerate; // current sampling freq (Hz) extern int MP3_channels; extern int MP3_bps; /* player level: */ int MP3_OpenDevice(char *devname); /* devname can be NULL for default) */ void MP3_Play(void); void MP3_Stop(void); void MP3_CloseDevice(void); #endif /* MPLAYER_MP3LIB_MP3_H */