Ticket #2655: smartdup3.patch

File smartdup3.patch, 4.4 KB (added by martin@…, 13 years ago)
  • mythtv/libs/libmythtv/recordingtypes.h

     
    3535    kDupCheckNone     = 0x01,
    3636    kDupCheckSub      = 0x02,
    3737    kDupCheckDesc     = 0x04,
    38     kDupCheckSubDesc  = 0x06
     38    kDupCheckSubDesc  = 0x06,
     39    kDupCheckSmart    = 0x08
    3940};
    4041
    4142enum RecSearchType
  • mythtv/libs/libmythtv/programinfo.cpp

     
    13901390         (description.lower() != other.description.lower())))
    13911391        return false;
    13921392
     1393    if ((dupmethod & kDupCheckSmart) &&
     1394        ((subtitle == "" && other.subtitle == "" && description.lower() != other.description.lower()) ||
     1395         (subtitle.lower() != other.subtitle.lower()) ||
     1396         (description == "" && subtitle == "")))
     1397        return false;
     1398
    13931399    return true;
    13941400}
    13951401
  • mythtv/programs/mythbackend/scheduler.cpp

     
    21982198"       AND "
    21992199"       (((RECTABLE.dupmethod & 0x04) = 0) OR (program.description <> '' "
    22002200"          AND program.description = oldrecorded.description)) "
     2201"       AND "
     2202"       (((RECTABLE.dupmethod & 0x08) = 0) OR (program.subtitle <> '' "
     2203"          AND program.subtitle = oldrecorded.subtitle) OR (program.subtitle = ''  "
     2204"          AND oldrecorded.subtitle = '' AND program.description <> '' "
     2205"          AND program.description = oldrecorded.description)) "
    22012206"      ) "
    22022207"     ) "
    22032208"  ) "
     
    22252230"       AND "
    22262231"       (((RECTABLE.dupmethod & 0x04) = 0) OR (program.description <> '' "
    22272232"          AND program.description = recorded.description)) "
     2233"       AND "
     2234"       (((RECTABLE.dupmethod & 0x08) = 0) OR (program.subtitle <> '' "
     2235"          AND program.subtitle = recorded.subtitle) OR (program.subtitle = ''  "
     2236"          AND recorded.subtitle = '' AND program.description <> '' "
     2237"          AND program.description = recorded.description)) "
    22282238"      ) "
    22292239"     ) "
    22302240"  ) "
  • mythplugins/mythweb/modules/_shared/lang/English_GB.lang

     
    539539"subtitle"
    540540"Subtitle"
    541541"Subtitle and Description"
     542"Subtitle else Description"
    542543"Subtitled"
    543544"Sunday"
    544545"The requested recording schedule has been deleted."
  • mythplugins/mythweb/modules/tv/includes/recording_schedules.php

     
    436436                case 2:  $str .= t('Subtitle');                     break;
    437437                case 4:  $str .= t('Description');                  break;
    438438                case 6:  $str .= t('Subtitle and Description');     break;
     439                case 8:  $str .= t('Subtitle else Description');    break;
    439440                case 22: $str .= t('Sub and Desc (Empty matches)'); break;
    440441            }
    441442            $str .= "</dd>\n";
  • mythplugins/mythweb/modules/tv/tmpl/default/detail.php

     
    457457                        if ($schedule->dupmethod == 6 || $schedule->dupmethod == 0)
    458458                            echo ' SELECTED';
    459459                        echo '>'.t('Subtitle and Description').'</option>';
     460                        echo '<option value="8"';
     461                        if ($schedule->dupmethod == 8)
     462                            echo ' SELECTED';
     463                        echo '>'.t('Subtitle else Description').'</option>';
    460464                   ?></select></dd>
    461465                <dt><?php echo t('Preferred Input') ?>:</dt>
    462466                <dd><?php input_select($schedule->prefinput, 'prefinput') ?></dd>