Ticket #3578: mythtv.patch

File mythtv.patch, 5.0 KB (added by paulx@…, 14 years ago)

The patch.

  • programs/mythtv-setup/backendsettings.cpp

     
    200200static GlobalComboBox *TimeOffset()
    201201{
    202202    GlobalComboBox *gc = new GlobalComboBox("TimeOffset");
    203     gc->setLabel(QObject::tr("Time offset for XMLTV listings"));
     203    gc->setLabel(QObject::tr("Adjust each XMLTV time"));
    204204    init_time_offsets(gc);
    205205    QString helptext = QObject::tr(
    206         "Adjust the relative timezone of the XMLTV EPG data read "
    207         "by mythfilldatabase.  "
    208         "'Auto' converts the XMLTV time to local time using your "
    209         "computer's timezone.  "
    210         "'None' ignores the XMLTV timezone, interpreting times as local.");
     206        "After subtracting any XMLTV timezone, add the selected value. "
     207        "'Auto' subtracts any XMLTV timezone, then adds your computer's timezone. "
     208        "'None' ignores any XMLTV timezone, interpreting time as local.");
    211209    gc->setHelpText(helptext);
    212210    return gc;
    213211};
  • programs/mythfilldatabase/main.cpp

     
    8686        {
    8787            if (((argpos + 3) >= a.argc()) ||
    8888                !strncmp(a.argv()[argpos + 1], "--", 2) ||
    89                 !strncmp(a.argv()[argpos + 2], "--", 2) ||
    90                 !strncmp(a.argv()[argpos + 3], "--", 2))
     89                !strncmp(a.argv()[argpos + 2], "--", 2))
    9190            {
    9291                printf("missing or invalid parameters for --file option\n");
    9392                return FILLDB_EXIT_INVALID_CMDLINE;
    9493            }
    9594
     95            if (!fromfile_name.isEmpty())
     96            {
     97                printf("only one --file option allowed\n");
     98                return FILLDB_EXIT_INVALID_CMDLINE;
     99            }
     100
    96101            fromfile_id = atoi(a.argv()[++argpos]);
    97             fromfile_offset = atoi(a.argv()[++argpos]);
    98102            fromfile_name = a.argv()[++argpos];
    99103
    100104            if (fill_data.IsVerbose())
     
    113117                return FILLDB_EXIT_INVALID_CMDLINE;
    114118            }
    115119
     120            if (!fromfile_name.isEmpty())
     121            {
     122                printf("only one --dd-file option allowed\n");
     123                return FILLDB_EXIT_INVALID_CMDLINE;
     124            }
     125
    116126            fromfile_id = atoi(a.argv()[++argpos]);
    117127            fromfile_offset = atoi(a.argv()[++argpos]);
    118128            fromddfile_lineupid = a.argv()[++argpos];
     
    132142                return FILLDB_EXIT_INVALID_CMDLINE;
    133143            }
    134144
     145            if (!fromxawfile_name.isEmpty())
     146            {
     147                printf("only one --xawchannels option allowed\n");
     148                return FILLDB_EXIT_INVALID_CMDLINE;
     149            }
     150
    135151            fromxawfile_id = atoi(a.argv()[++argpos]);
    136152            fromxawfile_name = a.argv()[++argpos];
    137153
     
    337353            cout << "\n";
    338354            cout << "--update\n";
    339355            cout << "   For running non-destructive updates on the database for\n";
    340             cout << "   users in xmltv zones that do not provide channel data\n";
     356            cout << "   users in xmltv zones that do not provide channel data.\n";
     357            cout << "   Stops the addition of new channels and the changing of channel icons.\n";
    341358            cout << "\n";
    342359            cout << "--preset\n";
    343360            cout << "   Use it in case that you want to assign a preset number for\n";
     
    348365            cout << "--no-delete\n";
    349366            cout << "   Do not delete old programs from the database until 7 days old.\n";
    350367            cout << "\n";
    351             cout << "--file <sourceid> <offset> <xmlfile>\n";
     368            cout << "--file <sourceid> <xmlfile>\n";
    352369            cout << "   Bypass the grabbers and read data directly from a file\n";
    353370            cout << "   <sourceid> = number for the video source to use with this file\n";
    354             cout << "   <offset>   = days from today that xmlfile defines\n";
    355             cout << "                (-1 means to replace all data, up to 10 days)\n";
    356371            cout << "   <xmlfile>  = file to read\n";
    357372            cout << "\n";
    358373            cout << "--dd-file <sourceid> <offset> <lineupid> <xmlfile>\n";
    359             cout << "   <sourceid> = see --file\n";
    360             cout << "   <offset>   = see --file\n";
     374            cout << "   <sourceid> = number for the video source to use with this file\n";
     375            cout << "   <offset>   = days from today that xmlfile defines\n";
     376            cout << "                (-1 means to replace all data, up to 10 days)\n";
    361377            cout << "   <lineupid> = the lineup id\n";
    362             cout << "   <xmlfile>  = see --file\n";
     378            cout << "   <xmlfile>  = file to read\n";
    363379            cout << "\n";
    364380            cout << "--xawchannels <sourceid> <xawtvrcfile>\n";
    365381            cout << "   (--manual flag works in combination with this)\n";