# HG changeset patch
# User arpi
# Date 1009323097 0
# Node ID d9d2ee82a2432a61350d4dcfd79f5952d9dd4699
# Parent  6d0283908517501531bdefa3b8018e77c049a22b
subtitle_t + audio_stream_t -> stream_language_t (cleanup)

diff -r 6d0283908517 -r d9d2ee82a243 Gui/mplayer/play.h
--- a/Gui/mplayer/play.h	Tue Dec 25 22:08:22 2001 +0000
+++ b/Gui/mplayer/play.h	Tue Dec 25 23:31:37 2001 +0000
@@ -44,9 +44,9 @@
  int current_title;
  int current_angle;
  int nr_of_audio_channels;
- audio_stream_t audio_streams[8];
+ stream_language_t audio_streams[32];
  int nr_of_subtitles;
- subtitle_t subtitles[32]; 
+ stream_language_t subtitles[32]; 
 } mplDVDStruct;
 #endif
 
diff -r 6d0283908517 -r d9d2ee82a243 libmpdemux/stream.h
--- a/libmpdemux/stream.h	Tue Dec 25 22:08:22 2001 +0000
+++ b/libmpdemux/stream.h	Tue Dec 25 23:31:37 2001 +0000
@@ -177,12 +177,7 @@
 typedef struct {
  int id; // 0 - 31 mpeg; 128 - 159 ac3; 160 - 191 pcm
  int language; 
-} audio_stream_t;
-
-typedef struct {
- int id; // 0 - 31
- int language;
-} subtitle_t;
+} stream_language_t;
 
 typedef struct {
   dvd_reader_t *dvd;
@@ -202,10 +197,10 @@
   int angle_seek;
 // audio datas
   int nr_of_channels;
-  audio_stream_t audio_streams[8];
+  stream_language_t audio_streams[32];
 // subtitles
   int nr_of_subtitles;
-  subtitle_t subtitles[32];
+  stream_language_t subtitles[32];
 } dvd_priv_t;
 
 #endif