diff options
| -rw-r--r-- | help/help_mp-en.h | 8 | ||||
| -rw-r--r-- | stream/stream_dvd.c | 18 |
2 files changed, 15 insertions, 11 deletions
diff --git a/help/help_mp-en.h b/help/help_mp-en.h index fe9ba2b634..2da69e19cc 100644 --- a/help/help_mp-en.h +++ b/help/help_mp-en.h @@ -522,8 +522,9 @@ static char help_text[]= #define MSGTR_SMBNotCompiled "MPlayer was not compiled with SMB reading support.\n" #define MSGTR_CantOpenDVD "Couldn't open DVD device: %s\n" + +// stream_dvd.c #define MSGTR_NoDVDSupport "MPlayer was compiled without DVD support, exiting.\n" -#define MSGTR_DVDwait "Reading disc structure, please wait...\n" #define MSGTR_DVDnumTitles "There are %d titles on this DVD.\n" #define MSGTR_DVDinvalidTitle "Invalid DVD title number: %d\n" #define MSGTR_DVDnumChapters "There are %d chapters in this DVD title.\n" @@ -537,9 +538,12 @@ static char help_text[]= #define MSGTR_DVDnoVOBs "Cannot open title VOBS (VTS_%02d_1.VOB).\n" #define MSGTR_DVDnoMatchingAudio "No matching DVD audio language found!\n" #define MSGTR_DVDaudioChannel "Selected DVD audio channel: %d language: %c%c\n" +#define MSGTR_DVDaudioStreamInfo "audio stream: %d format: %s (%s) language: %s aid: %d.\n" +#define MSGTR_DVDnumAudioChannels "number of audio channels on disk: %d.\n" #define MSGTR_DVDnoMatchingSubtitle "No matching DVD subtitle language found!\n" #define MSGTR_DVDsubtitleChannel "Selected DVD subtitle channel: %d language: %c%c\n" -#define MSGTR_DVDopenOk "DVD successfully opened.\n" +#define MSGTR_DVDsubtitleLanguage "subtitle ( sid ): %d language: %s\n" +#define MSGTR_DVDnumSubtitles "number of subtitles on disk: %d\n" // muxer.c, muxer_*.c: #define MSGTR_TooManyStreams "Too many streams!" diff --git a/stream/stream_dvd.c b/stream/stream_dvd.c index b222a6723a..224e9f7a23 100644 --- a/stream/stream_dvd.c +++ b/stream/stream_dvd.c @@ -593,7 +593,7 @@ static int open_s(stream_t *stream,int mode, void* opts, int* file_format) { } } - mp_msg(MSGT_OPEN,MSGL_INFO,MSGTR_DVDwait); + mp_msg(MSGT_OPEN,MSGL_V,"Reading disc structure, please wait...\n"); /** * Load the video manager to find out the information about the titles on @@ -635,7 +635,7 @@ static int open_s(stream_t *stream,int mode, void* opts, int* file_format) { /** * Make sure our title number is valid. */ - mp_msg(MSGT_OPEN,MSGL_INFO, MSGTR_DVDnumTitles, tt_srpt->nr_of_srpts ); + mp_msg(MSGT_OPEN,MSGL_STATUS, MSGTR_DVDnumTitles, tt_srpt->nr_of_srpts ); if(dvd_title < 1 || dvd_title > tt_srpt->nr_of_srpts) { mp_msg(MSGT_OPEN,MSGL_ERR, MSGTR_DVDinvalidTitle, dvd_title); ifoClose( vmg_file ); @@ -647,7 +647,7 @@ static int open_s(stream_t *stream,int mode, void* opts, int* file_format) { /** * Make sure the chapter number is valid for this title. */ - mp_msg(MSGT_OPEN,MSGL_INFO, MSGTR_DVDnumChapters, tt_srpt->title[dvd_title].nr_of_ptts); + mp_msg(MSGT_OPEN,MSGL_STATUS, MSGTR_DVDnumChapters, tt_srpt->title[dvd_title].nr_of_ptts); if(dvd_chapter<1 || dvd_chapter>tt_srpt->title[dvd_title].nr_of_ptts) { mp_msg(MSGT_OPEN,MSGL_ERR, MSGTR_DVDinvalidChapter, dvd_chapter); ifoClose( vmg_file ); @@ -669,7 +669,7 @@ static int open_s(stream_t *stream,int mode, void* opts, int* file_format) { /** * Make sure the angle number is valid for this title. */ - mp_msg(MSGT_OPEN,MSGL_INFO, MSGTR_DVDnumAngles, tt_srpt->title[dvd_title].nr_of_angles); + mp_msg(MSGT_OPEN,MSGL_STATUS, MSGTR_DVDnumAngles, tt_srpt->title[dvd_title].nr_of_angles); if(dvd_angle<1 || dvd_angle>tt_srpt->title[dvd_title].nr_of_angles) { mp_msg(MSGT_OPEN,MSGL_ERR, MSGTR_DVDinvalidAngle, dvd_angle); ifoClose( vmg_file ); @@ -704,7 +704,7 @@ static int open_s(stream_t *stream,int mode, void* opts, int* file_format) { return STREAM_UNSUPORTED; } - mp_msg(MSGT_OPEN,MSGL_INFO, MSGTR_DVDopenOk); + mp_msg(MSGT_OPEN,MSGL_V, "DVD successfully opened.\n"); // store data d=malloc(sizeof(dvd_priv_t)); memset(d,0,sizeof(dvd_priv_t)); d->dvd=dvd; @@ -765,7 +765,7 @@ static int open_s(stream_t *stream,int mode, void* opts, int* file_format) { // 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", + mp_msg(MSGT_OPEN,MSGL_STATUS,MSGTR_DVDaudioStreamInfo, d->nr_of_channels, dvd_audio_stream_types[ audio->audio_format ], dvd_audio_stream_channels[ audio->channels ], @@ -779,7 +779,7 @@ static int open_s(stream_t *stream,int mode, void* opts, int* file_format) { d->nr_of_channels++; } } - mp_msg(MSGT_OPEN,MSGL_V,"[open] number of audio channels on disk: %d.\n",d->nr_of_channels ); + mp_msg(MSGT_OPEN,MSGL_STATUS,MSGTR_DVDnumAudioChannels,d->nr_of_channels ); } /** @@ -822,13 +822,13 @@ static int open_s(stream_t *stream,int mode, void* opts, int* file_format) { d->subtitles[d->nr_of_subtitles].id = vts_file->vts_pgcit->pgci_srp[ttn].pgc->subp_control[i] >> 8 & 31; #endif - mp_msg(MSGT_OPEN,MSGL_V,"[open] subtitle ( sid ): %d language: %s\n", d->nr_of_subtitles, tmp); + mp_msg(MSGT_OPEN,MSGL_STATUS,MSGTR_DVDsubtitleLanguage, d->nr_of_subtitles, tmp); mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_SUBTITLE_ID=%d\n", d->subtitles[d->nr_of_subtitles].id); if(language && tmp[0]) mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_SID_%d_LANG=%s\n", d->nr_of_subtitles, tmp); d->nr_of_subtitles++; } - mp_msg(MSGT_OPEN,MSGL_V,"[open] number of subtitles on disk: %d\n",d->nr_of_subtitles ); + mp_msg(MSGT_OPEN,MSGL_STATUS,MSGTR_DVDnumSubtitles,d->nr_of_subtitles); } /** |