Mercurial > mplayer.hg
changeset 29847:e37311e178e1
Move arrays used by both dvd and dvdnav to dvd_common.
| author | reimar |
|---|---|
| date | Tue, 10 Nov 2009 23:15:48 +0000 |
| parents | f0e4324b3ecd |
| children | c20a30ebbe56 |
| files | stream/stream_dvd.c stream/stream_dvd_common.c stream/stream_dvd_common.h stream/stream_dvdnav.c |
| diffstat | 4 files changed, 6 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/stream/stream_dvd.c Tue Nov 10 23:12:01 2009 +0000 +++ b/stream/stream_dvd.c Tue Nov 10 23:15:48 2009 +0000 @@ -132,9 +132,6 @@ #endif #endif -const char * const dvd_audio_stream_types[8] = { "ac3","unknown","mpeg1","mpeg2ext","lpcm","unknown","dts" }; -const char * const dvd_audio_stream_channels[6] = { "mono", "stereo", "unknown", "unknown", "5.1/6.1", "5.1" }; - static struct stream_priv_s { int title;
--- a/stream/stream_dvd_common.c Tue Nov 10 23:12:01 2009 +0000 +++ b/stream/stream_dvd_common.c Tue Nov 10 23:15:48 2009 +0000 @@ -3,6 +3,9 @@ #include <dvdread/ifo_types.h> #include "stream_dvd_common.h" +const char * const dvd_audio_stream_types[8] = { "ac3","unknown","mpeg1","mpeg2ext","lpcm","unknown","dts" }; +const char * const dvd_audio_stream_channels[6] = { "mono", "stereo", "unknown", "unknown", "5.1/6.1", "5.1" }; + /** \brief Converts DVD time structure to milliseconds. \param *dev the DVD time structure to convert
--- a/stream/stream_dvd_common.h Tue Nov 10 23:12:01 2009 +0000 +++ b/stream/stream_dvd_common.h Tue Nov 10 23:15:48 2009 +0000 @@ -6,6 +6,9 @@ #include <dvdread/ifo_types.h> extern char *dvd_device; +extern const char * const dvd_audio_stream_channels[6]; +extern const char * const dvd_audio_stream_types[8]; + int mp_dvdtimetomsec(dvd_time_t *dt); #endif /* MPLAYER_STREAM_DVD_COMMON_H */
--- a/stream/stream_dvdnav.c Tue Nov 10 23:12:01 2009 +0000 +++ b/stream/stream_dvdnav.c Tue Nov 10 23:15:48 2009 +0000 @@ -47,8 +47,6 @@ unsigned int state; } dvdnav_priv_t; -extern char *dvd_audio_stream_channels[6], *dvd_audio_stream_types[8]; - static struct stream_priv_s { int track; char* device;