Ticket #6076: MarkAsInUse_fixes.diff

File MarkAsInUse_fixes.diff, 2.0 KB (added by Shane Shrybman, 15 years ago)

  • libs/libmythtv/NuppelVideoPlayer.cpp

     
    621621    videoFiltersForProgram = QString::null;
    622622    if (!gContext->IsDatabaseIgnored())
    623623    {
    624         player_ctx->playingInfo->MarkAsInUse(true, m_recusage);
    625624        videoFiltersForProgram = player_ctx->playingInfo->chanOutputFilters;
    626625        videoFiltersForProgram.detach();
    627626    }

  • libs/libmythtv/playercontext.cpp

     
    872872 */
    873873void PlayerContext::SetPlayingInfo(const ProgramInfo *info)
    874874{
     875    bool ignoreDB = gContext->IsDatabaseIgnored();
     876
    875877    QMutexLocker locker(&playingInfoLock);
    876878
    877879    if (playingInfo)
    878880    {
    879         playingInfo->MarkAsInUse(false);
     881        if (!ignoreDB)
     882            playingInfo->MarkAsInUse(false);
    880883        delete playingInfo;
    881884        playingInfo = NULL;
    882885    }
    … …  
    884887    if (info)
    885888    {
    886889        playingInfo = new ProgramInfo(*info);
     890        if (!ignoreDB)
     891            playingInfo->MarkAsInUse(true, "player");
    887892        playingLen  = playingInfo->CalculateLength();
    888893    }
    889894}

  • libs/libmythtv/tv_rec.cpp

     
    44604460        delete oldinfo;
    44614461    }
    44624462
     4463    pginfo->MarkAsInUse(true, "recorder");
    44634464    pginfo->SetAutoExpire(kLiveTVAutoExpire);
    44644465    pginfo->ApplyRecordRecGroupChange("LiveTV");
    44654466    tvchain->AppendNewProgram(pginfo, channel->GetCurrentName(),
    … …  
    44764477    else if (!set_rec)
    44774478    {
    44784479        if (curRecording)
     4480        {
     4481            curRecording->MarkAsInUse(false);
    44794482            delete curRecording;
     4483        }
    44804484        curRecording = pginfo;
    44814485        SetRingBuffer(rb);
    44824486    }