RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

Move arrays used by both dvd and dvdnav to dvd_common. 

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29889 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
reimar 2009-11-10 23:15:48 +00:00
parent 80217b4240
commit 36ec821836
4 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
stream/stream_dvd.c
View File

@ -132,9 +132,6 @@ static void dvd_set_speed(char *device, unsigned speed)
#endif #endif
#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 { static struct stream_priv_s {
int title; int title;

3
stream/stream_dvd_common.c
View File

@ -3,6 +3,9 @@
#include <dvdread/ifo_types.h> #include <dvdread/ifo_types.h>
#include "stream_dvd_common.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. \brief Converts DVD time structure to milliseconds.
\param *dev the DVD time structure to convert \param *dev the DVD time structure to convert

3
stream/stream_dvd_common.h
View File

@ -6,6 +6,9 @@
#include <dvdread/ifo_types.h> #include <dvdread/ifo_types.h>
extern char *dvd_device; 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); int mp_dvdtimetomsec(dvd_time_t *dt);
#endif /* MPLAYER_STREAM_DVD_COMMON_H */ #endif /* MPLAYER_STREAM_DVD_COMMON_H */

2
stream/stream_dvdnav.c
View File

@ -47,8 +47,6 @@ typedef struct {
unsigned int state; unsigned int state;
} dvdnav_priv_t; } dvdnav_priv_t;
extern char *dvd_audio_stream_channels[6], *dvd_audio_stream_types[8];
static struct stream_priv_s { static struct stream_priv_s {
int track; int track;
char* device; char* device;