[MPlayer-cvslog] r29889 - in trunk/stream: stream_dvd.c stream_dvd_common.c stream_dvd_common.h stream_dvdnav.c

[reimar]

Author: reimar
Date: Wed Nov 11 00:15:48 2009
New Revision: 29889

Log:
Move arrays used by both dvd and dvdnav to dvd_common.

Modified:
   trunk/stream/stream_dvd.c
   trunk/stream/stream_dvd_common.c
   trunk/stream/stream_dvd_common.h
   trunk/stream/stream_dvdnav.c

Modified: trunk/stream/stream_dvd.c
==============================================================================
--- trunk/stream/stream_dvd.c	Wed Nov 11 00:12:01 2009	(r29888)
+++ trunk/stream/stream_dvd.c	Wed Nov 11 00:15:48 2009	(r29889)
@@ -132,9 +132,6 @@ static void dvd_set_speed(char *device, 
 #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;

Modified: trunk/stream/stream_dvd_common.c
==============================================================================
--- trunk/stream/stream_dvd_common.c	Wed Nov 11 00:12:01 2009	(r29888)
+++ trunk/stream/stream_dvd_common.c	Wed Nov 11 00:15:48 2009	(r29889)
@@ -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

Modified: trunk/stream/stream_dvd_common.h
==============================================================================
--- trunk/stream/stream_dvd_common.h	Wed Nov 11 00:12:01 2009	(r29888)
+++ trunk/stream/stream_dvd_common.h	Wed Nov 11 00:15:48 2009	(r29889)
@@ -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 */

Modified: trunk/stream/stream_dvdnav.c
==============================================================================
--- trunk/stream/stream_dvdnav.c	Wed Nov 11 00:12:01 2009	(r29888)
+++ trunk/stream/stream_dvdnav.c	Wed Nov 11 00:15:48 2009	(r29889)
@@ -47,8 +47,6 @@ typedef struct {
   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;