Ticket #8669: mythtv-remove_smart_channel_change_setting.patch

File mythtv-remove_smart_channel_change_setting.patch, 3.6 KB (added by sphery, 14 years ago)

  • libs/libmythtv/tv_play.cpp 

    ---
 libs/libmythtv/tv_play.cpp               |    7 	2 +	5 -	0 !
 libs/libmythtv/tv_play.h                 |    1 	0 +	1 -	0 !
 programs/mythfrontend/globalsettings.cpp |   12 	0 +	12 -	0 !
 3 files changed, 2 insertions(+), 18 deletions(-)
    old new  
    861861      db_use_fixed_size(true),      db_browse_always(false),
    862862      db_browse_all_tuners(false),
    863863
    864       smartChannelChange(false),
    865864      arrowAccel(false),
    866865      tryUnflaggedSkip(false),
    867866      smartForward(false),
    … …  
    976975    kv["ChannelFormat"]            = "<num> <sign>";
    977976    kv["TimeFormat"]               = "h:mm AP";
    978977    kv["ShortDateFormat"]          = "M/d";
    979     kv["SmartChannelChange"]       = "0";
    980978
    981979    kv["UseArrowAccels"]           = "1";
    982980    kv["TryUnflaggedSkip"]         = "0";
    … …  
    10201018    db_channel_format      = kv["ChannelFormat"];
    10211019    db_time_format         = kv["TimeFormat"];
    10221020    db_short_date_format   = kv["ShortDateFormat"];
    1023     smartChannelChange     = kv["SmartChannelChange"].toInt();
    10241021    arrowAccel             = kv["UseArrowAccels"].toInt();
    10251022    tryUnflaggedSkip       = kv["TryUnflaggedSkip"].toInt();
    10261023    channel_group_id       = kv["ChannelGroupDefault"].toInt();
    … …  
    64576454    bool commitSmart = false;
    64586455    QString inputStr = GetQueuedInput();
    64596456
    6460     // Always use smartChannelChange when channel numbers are entered
     6457    // Always use immediate channel change when channel numbers are entered
    64616458    // in browse mode because in browse mode space/enter exit browse
    64626459    // mode and change to the currently browsed channel.
    64636460    if (StateIsLiveTV(GetState(ctx)) && !ccInputMode && !asInputMode &&
    6464         (smartChannelChange || browsemode))
     6461        browsemode)
    64656462    {
    64666463        commitSmart = ProcessSmartChannel(ctx, inputStr);
    64676464    }

  • libs/libmythtv/tv_play.h

    old new  
    681681    bool    db_browse_all_tuners;
    682682    DBChanList db_browse_all_channels;
    683683
    684     bool    smartChannelChange;
    685684    bool    arrowAccel;
    686685
    687686    CommSkipMode autoCommercialSkip;

  • programs/mythfrontend/globalsettings.cpp

    old new  
    30143014    return gc;
    30153015}
    30163016
    3017 static HostCheckBox *SmartChannelChange()
    3018 {
    3019     HostCheckBox *gc = new HostCheckBox("SmartChannelChange");
    3020     gc->setLabel(QObject::tr("Change channels immediately without select"));
    3021     gc->setValue(false);
    3022     gc->setHelpText(QObject::tr("When a complete channel number is entered "
    3023                     "MythTV will switch to that channel immediately without "
    3024                     "requiring you to hit the select button."));
    3025     return gc;
    3026 }
    3027 
    30283017static GlobalCheckBox *LastFreeCard()
    30293018{
    30303019    GlobalCheckBox *bc = new GlobalCheckBox("LastFreeCard");
    … …  
    43984387    general->addChild(ChannelOrdering());
    43994388    general->addChild(ChannelFormat());
    44004389    general->addChild(LongChannelFormat());
    4401     general->addChild(SmartChannelChange());
    44024390    general->addChild(LastFreeCard());
    44034391    general->addChild(LiveTVPriority());
    44044392    addChild(general);