Ticket #1326: mplayer-nonorm.patch

File mplayer-nonorm.patch, 1.8 KB (added by firewalkergr@…, 18 years ago)

After some change, every time a tv channel is changed, the tv set norm is set as well. This doesn't work with my cx8800 card. This patch removes the norm set, so it works with my card

  • stream/tv.c

    old new  
    957957                        else
    958958                                tv_channel_current = tv_channel_list;
    959959                               
    960                                 tv_set_norm_i(tvh, tv_channel_current->norm);
     960                                // tac tv_set_norm_i(tvh, tv_channel_current->norm);
    961961                                tv_set_freq(tvh, (unsigned long)(((float)tv_channel_current->freq/1000)*16));
    962962                                mp_msg(MSGT_TV, MSGL_INFO, MSGTR_TV_SelectedChannel3,
    963963                        tv_channel_current->number, tv_channel_current->name, (float)tv_channel_current->freq/1000);
    … …  
    969969                        else
    970970                                while (tv_channel_current->next)
    971971                                        tv_channel_current = tv_channel_current->next;
    972                                 tv_set_norm_i(tvh, tv_channel_current->norm);
     972                                // tac tv_set_norm_i(tvh, tv_channel_current->norm);
    973973                                tv_set_freq(tvh, (unsigned long)(((float)tv_channel_current->freq/1000)*16));
    974974                                mp_msg(MSGT_TV, MSGL_INFO, MSGTR_TV_SelectedChannel3,
    975975                        tv_channel_current->number, tv_channel_current->name, (float)tv_channel_current->freq/1000);
    … …  
    10141014                                tv_channel_current = tv_channel_current->next;
    10151015                mp_msg(MSGT_TV, MSGL_INFO, MSGTR_TV_SelectedChannel3, tv_channel_current->number,
    10161016                                tv_channel_current->name, (float)tv_channel_current->freq/1000);
    1017                 tv_set_norm_i(tvh, tv_channel_current->norm);
     1017//              tv_set_norm_i(tvh, tv_channel_current->norm);
    10181018                tv_set_freq(tvh, (unsigned long)(((float)tv_channel_current->freq/1000)*16));
    10191019        } else tv_set_channel_real(tvh, channel);
    10201020        return 1;
    … …  
    10321032
    10331033                mp_msg(MSGT_TV, MSGL_INFO, MSGTR_TV_SelectedChannel3, tv_channel_current->number,
    10341034                                tv_channel_current->name, (float)tv_channel_current->freq/1000);
    1035                 tv_set_norm_i(tvh, tv_channel_current->norm);
     1035//              tv_set_norm_i(tvh, tv_channel_current->norm);
    10361036                tv_set_freq(tvh, (unsigned long)(((float)tv_channel_current->freq/1000)*16));
    10371037        } else {
    10381038                int i;