Ticket #12693: ticket_12693_revised.patch

File ticket_12693_revised.patch, 2.4 KB (added by Peter Bennett <pgbennett@…>, 10 years ago)

Revised patch file

  • mythtv/libs/libmythtv/tv_play.cpp

    diff --git a/mythtv/libs/libmythtv/tv_play.cpp b/mythtv/libs/libmythtv/tv_play.cpp
    index 6e9e1ea..9b9511b 100644
    a b void TV::HandleStateChange(PlayerContext *mctx, PlayerContext *ctx)  
    26102610            QSize(QWIDGETSIZE_MAX, QWIDGETSIZE_MAX));
    26112611        mainWindow->setGeometry(player_bounds);
    26122612        mainWindow->ResizePainterWindow(player_bounds.size());
    2613         // PGB Do not disable the GUI when using openmax decoder,
     2613        // PGB Do not disable the GUI when using openmax renderer,
    26142614        // to ensure that space next to letterbox pictures
    26152615        // is painted.
    2616         QString decName = ctx->player->GetDecoder()->GetCodecDecoderName();
    2617         if (decName != "openmax" && !weDisabledGUI)
     2616        bool isOpenMaxRender = false;
     2617        if (ctx && ctx->player)
     2618        {
     2619            VideoOutput *vo = ctx->player->GetVideoOutput();
     2620            isOpenMaxRender = vo && vo->GetName() == "openmax";
     2621        }
     2622        if (!isOpenMaxRender && !weDisabledGUI)
    26182623        {
    26192624            weDisabledGUI = true;
    26202625            GetMythMainWindow()->PushDrawDisabled();
  • mythtv/libs/libmythtv/videoout_omx.h

    diff --git a/mythtv/libs/libmythtv/videoout_omx.h b/mythtv/libs/libmythtv/videoout_omx.h
    index 11be950..4760377 100644
    a b class VideoOutputOMX : public VideoOutput, private OMXComponentCtx  
    3232    virtual bool ApproveDeintFilter(const QString&) const;
    3333    virtual bool SetDeinterlacingEnabled(bool interlaced);
    3434    virtual bool SetupDeinterlace(bool interlaced, const QString& ovrf="");
     35    virtual QString GetName(void) const { return kName; } // = "openmax"
    3536    virtual bool IsPIPSupported(void) const { return true; }
    3637    virtual bool IsPBPSupported(void) const { return true; }
    3738    virtual QRect GetPIPRect(PIPLocation, MythPlayer* = NULL, bool = true) const;
  • mythtv/libs/libmythtv/videooutbase.h

    diff --git a/mythtv/libs/libmythtv/videooutbase.h b/mythtv/libs/libmythtv/videooutbase.h
    index 5e29143..c8ca444 100644
    a b class VideoOutput  
    145145
    146146    bool AllowPreviewEPG(void) const;
    147147
     148    virtual QString GetName(void) const { return QString(); }
    148149    virtual bool IsPIPSupported(void) const { return false; }
    149150    virtual bool IsPBPSupported(void) const { return false; }
    150151    virtual bool NeedExtraAudioDecode(void) const { return false; }