diff options
| author | pontscho <pontscho@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-07-05 23:47:00 +0000 |
|---|---|---|
| committer | pontscho <pontscho@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-07-05 23:47:00 +0000 |
| commit | 4e0bd7f66ac8cecc95301e88c9b0975d53682bb6 (patch) | |
| tree | 1bc8bfd3df10bdeb247c9b16e22e1a5d6fa20612 /libmpdemux | |
| parent | 28dbc3b505b8e1d45163d91b245663a50be59d52 (diff) | |
| download | mpv-4e0bd7f66ac8cecc95301e88c9b0975d53682bb6.tar.bz2 mpv-4e0bd7f66ac8cecc95301e88c9b0975d53682bb6.tar.xz | |
- 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
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6652 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux')
| -rw-r--r-- | libmpdemux/open.c | 13 | ||||
| -rw-r--r-- | libmpdemux/stream.h | 2 |
2 files changed, 12 insertions, 3 deletions
diff --git a/libmpdemux/open.c b/libmpdemux/open.c index a57861991f..ffd03a3293 100644 --- a/libmpdemux/open.c +++ b/libmpdemux/open.c @@ -56,6 +56,8 @@ int dvd_nav=0; /* use libdvdnav? */ 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 @@ if(dvd_title){ 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 @@ if(dvd_title){ 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); diff --git a/libmpdemux/stream.h b/libmpdemux/stream.h index 5f6281eef4..1a4db1671c 100644 --- a/libmpdemux/stream.h +++ b/libmpdemux/stream.h @@ -225,6 +225,8 @@ extern char * audio_stream; typedef struct { int id; // 0 - 31 mpeg; 128 - 159 ac3; 160 - 191 pcm int language; + int type; + int channels; } stream_language_t; typedef struct { |