[Mplayer-cvslog] CVS: main/libmpdemux open.c,1.48,1.49 stream.h,1.43,1.44

[Zoltan Ponekker]

Update of /cvsroot/mplayer/main/libmpdemux
In directory mail:/var/tmp.root/cvs-serv29922/libmpdemux

Modified Files:
	open.c stream.h 
Log Message:


- add icon (nice, but very ugly hakk:)
- move all window to one group
- better multilanguage support
- some small bug fixed
- some warning fixed
- swap the two menu
- fix small network playing bug ( evPlay instead of evPlayNetwork :)
- add channel name selection for equalizer support



Index: open.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/open.c,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- open.c	21 Jun 2002 22:52:01 -0000	1.48
+++ open.c	5 Jul 2002 23:47:00 -0000	1.49
@@ -56,6 +56,8 @@
 char * dvd_audio_stream_types[8] =
         { "ac3","unknown","mpeg1","mpeg2ext","lpcm","unknown","dts" };
 
+char * dvd_audio_stream_channels[6] =
+	{ "unknown", "stereo", "unknown", "unknown", "unknown", "5.1" };
 #endif
 
 extern int vcd_get_track_end(int fd,int track);
@@ -303,9 +305,15 @@
 		    break;
 	   }
 
-          mp_msg(MSGT_OPEN,MSGL_V,"[open] audio stream: %d audio format: %s language: %s aid: %d\n",
+	  d->audio_streams[d->nr_of_channels].type=audio->audio_format;
+	  // Pontscho: to my mind, tha channels:
+	  //  1 - stereo
+	  //  5 - 5.1
+	  d->audio_streams[d->nr_of_channels].channels=audio->channels;
+          mp_msg(MSGT_OPEN,MSGL_V,"[open] audio stream: %d audio format: %s (%s) language: %s aid: %d\n",
 	    d->nr_of_channels,
             dvd_audio_stream_types[ audio->audio_format ],
+	    dvd_audio_stream_channels[ audio->channels ],
 	    tmp,
 	    d->audio_streams[d->nr_of_channels].id
 	    );
@@ -369,8 +377,7 @@
     else
 	d->last_cell=d->cur_pgc->nr_of_cells;
     
-    if( d->cur_pgc->cell_playback[d->cur_cell].block_type 
-	== BLOCK_TYPE_ANGLE_BLOCK ) d->cur_cell+=dvd_angle;
+    if( d->cur_pgc->cell_playback[d->cur_cell].block_type == BLOCK_TYPE_ANGLE_BLOCK ) d->cur_cell+=dvd_angle;
     d->cur_pack = d->cur_pgc->cell_playback[ d->cur_cell ].first_sector;
     d->cell_last_pack=d->cur_pgc->cell_playback[ d->cur_cell ].last_sector;
     mp_msg(MSGT_DVD,MSGL_V, "DVD start cell: %d  pack: 0x%X-0x%X  \n",d->cur_cell,d->cur_pack,d->cell_last_pack);

Index: stream.h
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/stream.h,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- stream.h	2 Jul 2002 22:31:50 -0000	1.43
+++ stream.h	5 Jul 2002 23:47:00 -0000	1.44
@@ -225,6 +225,8 @@
 typedef struct {
  int id; // 0 - 31 mpeg; 128 - 159 ac3; 160 - 191 pcm
  int language; 
+ int type;
+ int channels;
 } stream_language_t;
 
 typedef struct {