diff options
author | wm4 <wm4@nowhere> | 2013-12-16 20:40:02 +0100 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2013-12-16 20:41:08 +0100 |
commit | 7dc7b900c622235d595337c988a0c75280084b7c (patch) | |
tree | 7f896555c9478430edd28d56fb6fde5691b0e643 /stream/tv.c | |
parent | 3e6cd3ef19aca7c79dfc73412f98b70b7de011b4 (diff) | |
download | mpv-7dc7b900c622235d595337c988a0c75280084b7c.tar.bz2 mpv-7dc7b900c622235d595337c988a0c75280084b7c.tar.xz |
Replace mp_tmsg, mp_dbg -> mp_msg, remove mp_gtext(), remove set_osd_tmsg
The tmsg stuff was for the internal gettext() based translation system,
which nobody ever attempted to use and thus was removed. mp_gtext() and
set_osd_tmsg() were also for this.
mp_dbg was once enabled in debug mode only, but since we have log level
for enabling debug messages, it seems utterly useless.
Diffstat (limited to 'stream/tv.c')
-rw-r--r-- | stream/tv.c | 62 |
1 files changed, 31 insertions, 31 deletions
diff --git a/stream/tv.c b/stream/tv.c index 1bed93ef67..49d69b7865 100644 --- a/stream/tv.c +++ b/stream/tv.c @@ -124,7 +124,7 @@ static void tv_scan(tvi_handle_t *tvh) //Channel scanner without tuner is useless and causes crash due to uninitialized chanlist_s if (tvh->functions->control(tvh->priv, TVI_CONTROL_IS_TUNER, 0) != TVI_CONTROL_TRUE) { - mp_tmsg(MSGT_TV, MSGL_WARN, "Channel scanner is not available without tuner\n"); + mp_msg(MSGT_TV, MSGL_WARN, "Channel scanner is not available without tuner\n"); tvh->tv_param->scan=0; return; } @@ -276,7 +276,7 @@ static int norm_from_string(tvi_handle_t *tvh, char* norm) if(ret!=TVI_CONTROL_UNKNOWN) { - mp_tmsg(MSGT_TV, MSGL_WARN, "tv.c: norm_from_string(%s): Bogus norm parameter, setting %s.\n", norm,"default"); + mp_msg(MSGT_TV, MSGL_WARN, "tv.c: norm_from_string(%s): Bogus norm parameter, setting %s.\n", norm,"default"); return 0; } @@ -295,7 +295,7 @@ static int norm_from_string(tvi_handle_t *tvh, char* norm) else if (!strcasecmp(norm, "ntscjp")) return TV_NORM_NTSCJP; else { - mp_tmsg(MSGT_TV, MSGL_WARN, "tv.c: norm_from_string(%s): Bogus norm parameter, setting %s.\n", norm, "PAL"); + mp_msg(MSGT_TV, MSGL_WARN, "tv.c: norm_from_string(%s): Bogus norm parameter, setting %s.\n", norm, "PAL"); return TV_NORM_PAL; } } @@ -304,7 +304,7 @@ static void parse_channels(tvi_handle_t *tvh) { char** channels = tvh->tv_param->channels; - mp_tmsg(MSGT_TV, MSGL_INFO, "TV channel names detected.\n"); + mp_msg(MSGT_TV, MSGL_INFO, "TV channel names detected.\n"); tv_channel_list = malloc(sizeof(tv_channels_t)); tv_channel_list->index=1; tv_channel_list->next=NULL; @@ -344,7 +344,7 @@ static void parse_channels(tvi_handle_t *tvh) } } if (tv_channel_current->freq == 0) - mp_tmsg(MSGT_TV, MSGL_ERR, "Couldn't find frequency for channel %s (%s)\n", + mp_msg(MSGT_TV, MSGL_ERR, "Couldn't find frequency for channel %s (%s)\n", tv_channel_current->number, tv_channel_current->name); else { sep = strchr(tv_channel_current->name, '-'); @@ -384,9 +384,9 @@ int tv_set_norm(tvi_handle_t *tvh, char* norm) { tvh->norm = norm_from_string(tvh, norm); - mp_tmsg(MSGT_TV, MSGL_V, "Selected norm : %s\n", norm); + mp_msg(MSGT_TV, MSGL_V, "Selected norm : %s\n", norm); if (tvh->functions->control(tvh->priv, TVI_CONTROL_TUN_SET_NORM, &tvh->norm) != TVI_CONTROL_TRUE) { - mp_tmsg(MSGT_TV, MSGL_ERR, "Error: Cannot set norm!\n"); + mp_msg(MSGT_TV, MSGL_ERR, "Error: Cannot set norm!\n"); return 0; } return 1; @@ -396,9 +396,9 @@ static int tv_set_norm_i(tvi_handle_t *tvh, int norm) { tvh->norm = norm; - mp_tmsg(MSGT_TV, MSGL_V, "Selected norm id: %d\n", norm); + mp_msg(MSGT_TV, MSGL_V, "Selected norm id: %d\n", norm); if (tvh->functions->control(tvh->priv, TVI_CONTROL_TUN_SET_NORM, &tvh->norm) != TVI_CONTROL_TRUE) { - mp_tmsg(MSGT_TV, MSGL_ERR, "Error: Cannot set norm!\n"); + mp_msg(MSGT_TV, MSGL_ERR, "Error: Cannot set norm!\n"); return 0; } @@ -430,7 +430,7 @@ static int open_tv(tvi_handle_t *tvh) if (funcs->control(tvh->priv, TVI_CONTROL_IS_VIDEO, 0) != TVI_CONTROL_TRUE) { - mp_tmsg(MSGT_TV, MSGL_ERR, "Error: No video input present!\n"); + mp_msg(MSGT_TV, MSGL_ERR, "Error: No video input present!\n"); return 0; } @@ -458,7 +458,7 @@ static int open_tv(tvi_handle_t *tvh) case MP_FOURCC_BGR15: break; default: - mp_tmsg(MSGT_TV, MSGL_ERR, + mp_msg(MSGT_TV, MSGL_ERR, "==================================================================\n"\ " WARNING: UNTESTED OR UNKNOWN OUTPUT IMAGE FORMAT REQUESTED (0x%x)\n"\ " This may cause buggy playback or program crash! Bug reports will\n"\ @@ -492,7 +492,7 @@ static int open_tv(tvi_handle_t *tvh) funcs->control(tvh->priv, TVI_CONTROL_VID_SET_WIDTH, &tvh->tv_param->width); else { - mp_tmsg(MSGT_TV, MSGL_ERR, "Unable to set requested width: %d\n", tvh->tv_param->width); + mp_msg(MSGT_TV, MSGL_ERR, "Unable to set requested width: %d\n", tvh->tv_param->width); funcs->control(tvh->priv, TVI_CONTROL_VID_GET_WIDTH, &tvh->tv_param->width); } } @@ -504,14 +504,14 @@ static int open_tv(tvi_handle_t *tvh) funcs->control(tvh->priv, TVI_CONTROL_VID_SET_HEIGHT, &tvh->tv_param->height); else { - mp_tmsg(MSGT_TV, MSGL_ERR, "Unable to set requested height: %d\n", tvh->tv_param->height); + mp_msg(MSGT_TV, MSGL_ERR, "Unable to set requested height: %d\n", tvh->tv_param->height); funcs->control(tvh->priv, TVI_CONTROL_VID_GET_HEIGHT, &tvh->tv_param->height); } } if (funcs->control(tvh->priv, TVI_CONTROL_IS_TUNER, 0) != TVI_CONTROL_TRUE) { - mp_tmsg(MSGT_TV, MSGL_WARN, "Selected input hasn't got a tuner!\n"); + mp_msg(MSGT_TV, MSGL_WARN, "Selected input hasn't got a tuner!\n"); goto done; } @@ -527,16 +527,16 @@ static int open_tv(tvi_handle_t *tvh) } if (tvh->chanlist == -1) { - mp_tmsg(MSGT_TV, MSGL_WARN, "Unable to find selected channel list! (%s)\n", + mp_msg(MSGT_TV, MSGL_WARN, "Unable to find selected channel list! (%s)\n", tvh->tv_param->chanlist); return 0; } else - mp_tmsg(MSGT_TV, MSGL_V, "Selected channel list: %s (including %d channels)\n", + mp_msg(MSGT_TV, MSGL_V, "Selected channel list: %s (including %d channels)\n", chanlists[tvh->chanlist].name, chanlists[tvh->chanlist].count); if (tvh->tv_param->freq && tvh->tv_param->channel) { - mp_tmsg(MSGT_TV, MSGL_WARN, "You can't set frequency and channel simultaneously!\n"); + mp_msg(MSGT_TV, MSGL_WARN, "You can't set frequency and channel simultaneously!\n"); goto done; } @@ -589,14 +589,14 @@ static int open_tv(tvi_handle_t *tvh) funcs->control(tvh->priv, TVI_CONTROL_TUN_SET_FREQ, &freq); funcs->control(tvh->priv, TVI_CONTROL_TUN_GET_FREQ, &freq); - mp_tmsg(MSGT_TV, MSGL_V, "Selected frequency: %lu (%.3f)\n", + mp_msg(MSGT_TV, MSGL_V, "Selected frequency: %lu (%.3f)\n", freq, freq/16.0); } if (tvh->tv_param->channel) { struct CHANLIST cl; - mp_tmsg(MSGT_TV, MSGL_V, "Requested channel: %s\n", tvh->tv_param->channel); + mp_msg(MSGT_TV, MSGL_V, "Requested channel: %s\n", tvh->tv_param->channel); for (i = 0; i < chanlists[tvh->chanlist].count; i++) { cl = tvh->chanlist_s[i]; @@ -606,7 +606,7 @@ static int open_tv(tvi_handle_t *tvh) { strcpy(tv_channel_last_real, cl.name); tvh->channel = i; - mp_tmsg(MSGT_TV, MSGL_INFO, "Selected channel: %s (freq: %.3f)\n", + mp_msg(MSGT_TV, MSGL_INFO, "Selected channel: %s (freq: %.3f)\n", cl.name, cl.freq/1000.0); tv_set_freq_float(tvh, cl.freq); break; @@ -644,7 +644,7 @@ static tvi_handle_t *tv_begin(tv_param_t* tv_param) int i; tvi_handle_t* h; if(tv_param->driver && !strcmp(tv_param->driver,"help")){ - mp_tmsg(MSGT_TV,MSGL_INFO,"Available drivers:\n"); + mp_msg(MSGT_TV,MSGL_INFO,"Available drivers:\n"); for(i=0;tvi_driver_list[i];i++){ mp_msg(MSGT_TV,MSGL_INFO," %s\t%s",tvi_driver_list[i]->short_name,tvi_driver_list[i]->name); if(tvi_driver_list[i]->comment) @@ -665,7 +665,7 @@ static tvi_handle_t *tv_begin(tv_param_t* tv_param) continue; h->tv_param=tv_param; - mp_tmsg(MSGT_TV, MSGL_INFO, "Selected driver: %s\n name: %s\n author: %s\n comment: %s\n", tvi_driver_list[i]->short_name, + mp_msg(MSGT_TV, MSGL_INFO, "Selected driver: %s\n name: %s\n author: %s\n comment: %s\n", tvi_driver_list[i]->short_name, tvi_driver_list[i]->name, tvi_driver_list[i]->author, tvi_driver_list[i]->comment?tvi_driver_list[i]->comment:""); @@ -675,9 +675,9 @@ static tvi_handle_t *tv_begin(tv_param_t* tv_param) } if(tv_param->driver) - mp_tmsg(MSGT_TV, MSGL_ERR, "No such driver: %s\n", tv_param->driver); + mp_msg(MSGT_TV, MSGL_ERR, "No such driver: %s\n", tv_param->driver); else - mp_tmsg(MSGT_TV, MSGL_ERR, "TV driver autodetection failed.\n"); + mp_msg(MSGT_TV, MSGL_ERR, "TV driver autodetection failed.\n"); return NULL; } @@ -784,7 +784,7 @@ static int demux_open_tv(demuxer_t *demuxer, enum demux_check check) break; case AF_FORMAT_MPEG2: default: - mp_tmsg(MSGT_TV, MSGL_ERR, "Audio type '%s' unsupported!\n", + mp_msg(MSGT_TV, MSGL_ERR, "Audio type '%s' unsupported!\n", af_fmt_to_str(audio_format)); goto no_audio; } @@ -816,7 +816,7 @@ static int demux_open_tv(demuxer_t *demuxer, enum demux_check check) sh_audio->wf->nBlockAlign = samplesize * sh_audio->channels.num; sh_audio->wf->nAvgBytesPerSec = sh_audio->i_bps; - mp_tmsg(MSGT_DECVIDEO, MSGL_V, " TV audio: %d channels, %d bits, %d Hz\n", + mp_msg(MSGT_DECVIDEO, MSGL_V, " TV audio: %d channels, %d bits, %d Hz\n", sh_audio->wf->nChannels, sh_audio->wf->wBitsPerSample, sh_audio->wf->nSamplesPerSec); } @@ -865,7 +865,7 @@ int tv_set_color_options(tvi_handle_t *tvh, int opt, int value) case TV_COLOR_CONTRAST: return funcs->control(tvh->priv, TVI_CONTROL_VID_SET_CONTRAST, &value); default: - mp_tmsg(MSGT_TV, MSGL_WARN, "Unknown color option (%d) specified!\n", opt); + mp_msg(MSGT_TV, MSGL_WARN, "Unknown color option (%d) specified!\n", opt); } return TVI_CONTROL_UNKNOWN; @@ -886,7 +886,7 @@ int tv_get_color_options(tvi_handle_t *tvh, int opt, int* value) case TV_COLOR_CONTRAST: return funcs->control(tvh->priv, TVI_CONTROL_VID_GET_CONTRAST, value); default: - mp_tmsg(MSGT_TV, MSGL_WARN, "Unknown color option (%d) specified!\n", opt); + mp_msg(MSGT_TV, MSGL_WARN, "Unknown color option (%d) specified!\n", opt); } return TVI_CONTROL_UNKNOWN; @@ -897,7 +897,7 @@ int tv_get_freq(tvi_handle_t *tvh, unsigned long *freq) if (tvh->functions->control(tvh->priv, TVI_CONTROL_IS_TUNER, 0) == TVI_CONTROL_TRUE) { tvh->functions->control(tvh->priv, TVI_CONTROL_TUN_GET_FREQ, freq); - mp_tmsg(MSGT_TV, MSGL_V, "Current frequency: %lu (%.3f)\n", + mp_msg(MSGT_TV, MSGL_V, "Current frequency: %lu (%.3f)\n", *freq, *freq/16.0); } return 1; @@ -913,7 +913,7 @@ int tv_set_freq(tvi_handle_t *tvh, unsigned long freq) tvh->functions->control(tvh->priv, TVI_CONTROL_TUN_SET_FREQ, &freq); tvh->functions->control(tvh->priv, TVI_CONTROL_TUN_GET_FREQ, &freq); - mp_tmsg(MSGT_TV, MSGL_V, "Current frequency: %lu (%.3f)\n", + mp_msg(MSGT_TV, MSGL_V, "Current frequency: %lu (%.3f)\n", freq, freq/16.0); } return 1; @@ -1079,7 +1079,7 @@ int tv_step_norm(tvi_handle_t *tvh) tvh->norm = 0; if (tvh->functions->control(tvh->priv, TVI_CONTROL_TUN_SET_NORM, &tvh->norm) != TVI_CONTROL_TRUE) { - mp_tmsg(MSGT_TV, MSGL_ERR, "Error: Cannot set norm!\n"); + mp_msg(MSGT_TV, MSGL_ERR, "Error: Cannot set norm!\n"); return 0; } } |