Ticket #518: mythdiseqcupdate-3.patch

File mythdiseqcupdate-3.patch, 4.0 KB (added by Dibblah, 18 years ago)

Changes the 'GENERAL' output to 'CHANNEL'

  • libs/libmythtv/dvbdiseqc.cpp

     
    185185
    186186    usleep(DISEQC_SHORT_WAIT);
    187187
    188     GENERAL(QString("DiSEqC Sending 1.0 Command: %1 %2 %3 %4")
     188    CHANNEL(QString("DiSEqC Sending 1.0 Command: %1 %2 %3 %4")
    189189                   .arg(cmd.msg[0], 2, 16)
    190190                   .arg(cmd.msg[1], 2, 16)
    191191                   .arg(cmd.msg[2], 2, 16)
    … …  
    210210
    211211            if (tuning.diseqc_type == 7)
    212212            {
    213                 GENERAL(QString("DiSEqC Sending 1.3 Repeat Command: %1 %2 %3 %4 %5")
     213                CHANNEL(QString("DiSEqC Sending 1.3 Repeat Command: %1 %2 %3 %4 %5")
    214214                               .arg(cmd.msg[0],2,16)
    215215                               .arg(cmd.msg[1],2,16)
    216216                               .arg(cmd.msg[2],2,16)
    … …  
    219219            }
    220220            else
    221221            {
    222                 GENERAL(QString("DiSEqC Sending 1.1/1.2 Repeat Command: %1 %2 %3 %4")
     222                CHANNEL(QString("DiSEqC Sending 1.1/1.2 Repeat Command: %1 %2 %3 %4")
    223223                           .arg(cmd.msg[0],2,16)
    224224                           .arg(cmd.msg[1],2,16)
    225225                           .arg(cmd.msg[2],2,16)
    … …  
    273273
    274274    usleep(DISEQC_SHORT_WAIT);
    275275
    276     GENERAL(QString("DiSEqC Sending 1.0 Command: %1 %2 %3 %4")
     276    CHANNEL(QString("DiSEqC Sending 1.0 Command: %1 %2 %3 %4")
    277277                   .arg(cmd.msg[0], 2, 16)
    278278                   .arg(cmd.msg[1], 2, 16)
    279279                   .arg(cmd.msg[2], 2, 16)
    … …  
    290290    int repeats = repeat;
    291291    while (repeats--)
    292292    {
    293         GENERAL(QString("DiSEqC Sending 1.1/1.2/1.3 Repeat Command: %1 %2 %3 %4")
     293        CHANNEL(QString("DiSEqC Sending 1.1/1.2/1.3 Repeat Command: %1 %2 %3 %4")
    294294                       .arg(cmd.msg[0], 2, 16)
    295295                       .arg(cmd.msg[1], 2, 16)
    296296                       .arg(cmd.msg[2], 2, 16)
    … …  
    334334        }
    335335    }
    336336
    337     GENERAL(QString("DiSEqC 1.1 Switch - Port %1").arg(tuning.diseqc_port));
     337    CHANNEL(QString("DiSEqC 1.1 Switch - Port %1").arg(tuning.diseqc_port));
    338338
    339339    if ((prev_tuning.diseqc_port != tuning.diseqc_port ||
    340340        prev_tuning.tone != tuning.tone ||
    … …  
    380380        }
    381381    }
    382382
    383     GENERAL(QString("DiSEqC 1.0 Switch - Port %1").arg(tuning.diseqc_port));
     383    CHANNEL(QString("DiSEqC 1.0 Switch - Port %1").arg(tuning.diseqc_port));
    384384
    385385    if ((prev_tuning.diseqc_port != tuning.diseqc_port ||
    386386        prev_tuning.tone != tuning.tone ||
    … …  
    495495bool DVBDiSEqC::PositionerGoto(DVBTuning& tuning, bool reset, bool& havetuned)
    496496{
    497497    // A reset seems to be required for my positioner to work consistently
    498     GENERAL(QString("DiSEqC 1.2 Motor - Goto Stored Position %1")
     498    CHANNEL(QString("DiSEqC 1.2 Motor - Goto Stored Position %1")
    499499                    .arg(tuning.diseqc_port));
    500500
    501501    if ((prev_tuning.diseqc_port != tuning.diseqc_port ||
    … …  
    535535        return false;
    536536    }
    537537
    538     GENERAL(QString("DiSEqC 1.2 Motor - Store Stored Position %1")
     538    CHANNEL(QString("DiSEqC 1.2 Motor - Store Stored Position %1")
    539539        .arg(tuning.diseqc_port));
    540540
    541541    dvb_diseqc_master_cmd cmd =
    … …  
    649649    // TODO: Send information here to FE saying motor is moving and
    650650    //       to expect a longer than average tuning delay
    651651    if (prev_tuning.diseqc_pos != tuning.diseqc_pos)
    652         GENERAL("DiSEqC Motor Moving");
     652        CHANNEL("DiSEqC Motor Moving");
    653653
    654654    int CMD1=0x00 , CMD2=0x00;        // Bytes sent to motor
    655655    double USALS=0.0;
    … …  
    701701    // and added to tuning
    702702    // sat_pos be passed into tuning, and be a float not an int./
    703703
    704     GENERAL(QString("DiSEqC 1.3 Motor - Goto Angular Position %1").arg(tuning.diseqc_pos));
     704    CHANNEL(QString("DiSEqC 1.3 Motor - Goto Angular Position %1").arg(tuning.diseqc_pos));
    705705
    706706    if ((prev_tuning.diseqc_port != tuning.diseqc_port ||
    707707          prev_tuning.tone != tuning.tone ||