Ticket #10877: 10877-v1.patch

File 10877-v1.patch, 4.2 KB (added by danielk, 12 years ago)

possible fix

  • mythtv/programs/mythbackend/services/content.cpp 

    diff --git a/mythtv/programs/mythbackend/services/content.cpp b/mythtv/programs/mythbackend/services/content.cpp
index 97758be..e61c58d 100644
    a b DTC::ArtworkInfoList* Content::GetRecordingArtworkList( 
    269269    if (chanid <= 0 || !recstarttsRaw.isValid())
    270270        throw( QString("Channel ID or StartTime appears invalid."));
    271271
    272     ProgramInfo pInfo(chanid, recstarttsRaw.toUTC());
     272    ProgramInfo pInfo(chanid, MythDate::as_utc(recstarttsRaw));
    273273
    274274    return GetProgramArtworkList(pInfo.GetInetRef(), pInfo.GetSeason());
    275275}
    … … QFileInfo Content::GetPreviewImage( int nChanId, 
    442442        throw sMsg;
    443443    }
    444444
    445     QDateTime recstartts = recstarttsRaw.toUTC();
     445    QDateTime recstartts = MythDate::as_utc(recstarttsRaw);
    446446
    447447    // ----------------------------------------------------------------------
    448448    // Read Recording From Database
    … … QFileInfo Content::GetRecording( int nChanId, 
    591591    // Read Recording From Database
    592592    // ------------------------------------------------------------------
    593593
    594     QDateTime recstartts = recstarttsRaw.toUTC();
     594    QDateTime recstartts = MythDate::as_utc(recstarttsRaw);
    595595
    596596    ProgramInfo pginfo((uint)nChanId, recstartts);
    597597
    … … DTC::LiveStreamInfo *Content::AddRecordingLiveStream( 
    946946    // Read Recording From Database
    947947    // ------------------------------------------------------------------
    948948
    949     QDateTime recstartts = recstarttsRaw.toUTC();
     949    QDateTime recstartts = MythDate::as_utc(recstarttsRaw);
    950950
    951951    ProgramInfo pginfo((uint)nChanId, recstartts);
    952952

  • mythtv/programs/mythbackend/services/dvr.cpp 

    diff --git a/mythtv/programs/mythbackend/services/dvr.cpp b/mythtv/programs/mythbackend/services/dvr.cpp
index 9582bd4..9c45e40 100644
    a b DTC::Program* Dvr::GetRecorded(int chanid, const QDateTime &recstarttsRaw) 
    166166    if (chanid <= 0 || !recstarttsRaw.isValid())
    167167        throw QString("Channel ID or StartTime appears invalid.");
    168168
    169     ProgramInfo pi(chanid, recstarttsRaw.toUTC());
     169    ProgramInfo pi(chanid, MythDate::as_utc(recstarttsRaw));
    170170
    171171    DTC::Program *pProgram = new DTC::Program();
    172172    FillProgramInfo( pProgram, &pi, true );
    … … bool Dvr::RemoveRecorded(int chanid, const QDateTime &recstarttsRaw) 
    183183    if (chanid <= 0 || !recstarttsRaw.isValid())
    184184        throw QString("Channel ID or StartTime appears invalid.");
    185185
    186     ProgramInfo pi(chanid, recstarttsRaw.toUTC());
     186    ProgramInfo pi(chanid, MythDate::as_utc(recstarttsRaw));
    187187
    188188    if (pi.GetChanID() && pi.HasPathname())
    189189    {
    … … int Dvr::AddRecordSchedule ( int chanid, 
    454454                               bool      bAutoUserJob4,
    455455                               int       nTranscoder)
    456456{
    457     QDateTime recstartts = recstarttsRaw.toUTC();
     457    QDateTime recstartts = MythDate::as_utc(recstarttsRaw);
    458458    RecordingInfo info(chanid, recstartts, false);
    459459    RecordingRule *rule = info.GetRecordingRule();
    460460    // ^ rule is owned by info and deleted when it leaves scope

  • mythtv/programs/mythbackend/services/guide.cpp 

    diff --git a/mythtv/programs/mythbackend/services/guide.cpp b/mythtv/programs/mythbackend/services/guide.cpp
index 0f2b6fa..8e68cd3 100644
    a b DTC::ProgramGuide *Guide::GetProgramGuide( const QDateTime &rawStartTime , 
    5353    if (!rawEndTime.isValid())
    5454        throw( "EndTime is invalid" );
    5555
    56     QDateTime dtStartTime = rawStartTime.toUTC();
    57     QDateTime dtEndTime = rawEndTime.toUTC();
     56    QDateTime dtStartTime = MythDate::as_utc(rawStartTime);
     57    QDateTime dtEndTime = MythDate::as_utc(rawEndTime);
    5858
    5959    if (dtEndTime < dtStartTime)
    6060        throw( "EndTime is before StartTime");
    … … DTC::Program* Guide::GetProgramDetails( int nChanId, 
    174174    if (!rawStartTime.isValid())
    175175        throw( "StartTime is invalid" );
    176176
    177     QDateTime dtStartTime = rawStartTime.toUTC();
     177    QDateTime dtStartTime = MythDate::as_utc(rawStartTime);
    178178
    179179    // ----------------------------------------------------------------------
    180180    // -=>TODO: Add support for getting Recorded Program Info