Ticket #11033: slideshow.patch

File slideshow.patch, 3.9 KB (added by spam@…, 14 years ago)

  • mythplugins/mythgallery/mythgallery/glsingleview.cpp 

    From 797fd5fe7aa905cfb4c58165c72c6e5800a001d6 Mon Sep 17 00:00:00 2001
From: Chad Parry <github@chad.parry.org>
Date: Thu, 23 Aug 2012 23:47:24 -0600
Subject: Disable the idle timer during a slideshow

---
 .../mythgallery/mythgallery/glsingleview.cpp       |    4 ++++
 mythplugins/mythgallery/mythgallery/singleview.cpp |    4 ++++
 2 files changed, 8 insertions(+)

diff --git a/mythplugins/mythgallery/mythgallery/glsingleview.cpp b/mythplugins/mythgallery/mythgallery/glsingleview.cpp
index 47a2ced..f0b0f3d 100644
    a b GLSingleView::GLSingleView(ThumbList itemList, int *pos, int slideShow,  
    135135
    136136    if (slideShow)
    137137    {
     138        GetMythMainWindow()->PauseIdleTimer(true);
    138139        m_slideshow_running = true;
    139140        m_slideshow_timer->stop();
    140141        m_slideshow_timer->setSingleShot(true);
    … … void GLSingleView::keyPressEvent(QKeyEvent *e)  
    270271{
    271272    bool handled    = false;
    272273
     274    if (m_slideshow_running)
     275        GetMythMainWindow()->PauseIdleTimer(false);
    273276    bool wasRunning = m_slideshow_running;
    274277    m_slideshow_timer->stop();
    275278    m_slideshow_running = false;
    … … void GLSingleView::keyPressEvent(QKeyEvent *e)  
    473476
    474477    if (m_slideshow_running)
    475478    {
     479        GetMythMainWindow()->PauseIdleTimer(true);
    476480        GetMythUI()->DisableScreensaver();
    477481    }
    478482

  • mythplugins/mythgallery/mythgallery/singleview.cpp 

    diff --git a/mythplugins/mythgallery/mythgallery/singleview.cpp b/mythplugins/mythgallery/mythgallery/singleview.cpp
index e7bcee7..e841201 100644
    a b SingleView::SingleView(  
    137137
    138138    if (slideShow)
    139139    {
     140        GetMythMainWindow()->PauseIdleTimer(true);
    140141        m_slideshow_running = true;
    141142        m_slideshow_timer->stop();
    142143        m_slideshow_timer->setSingleShot(true);
    … … void SingleView::keyPressEvent(QKeyEvent *e)  
    333334{
    334335    bool handled = false;
    335336
     337    if (m_slideshow_running)
     338        GetMythMainWindow()->PauseIdleTimer(false);
    336339    bool wasRunning = m_slideshow_running;
    337340    m_slideshow_timer->stop();
    338341    m_caption_timer->stop();
    … … void SingleView::keyPressEvent(QKeyEvent *e)  
    524527    }
    525528    if (m_slideshow_running)
    526529    {
     530        GetMythMainWindow()->PauseIdleTimer(true);
    527531        GetMythUI()->DisableScreensaver();
    528532    }
    529533

  • mythplugins/mythgallery/mythgallery/glsingleview.cpp 

    -- 
1.7.9.5


From ebf093bafbf9a2a0dee81d762a79c8d865535136 Mon Sep 17 00:00:00 2001
From: Chad Parry <github@chad.parry.org>
Date: Fri, 24 Aug 2012 01:19:20 -0600
Subject: Restart the idle timer after escaping from a slideshow

---
 .../mythgallery/mythgallery/glsingleview.cpp       |    6 ++++++
 mythplugins/mythgallery/mythgallery/singleview.cpp |    6 ++++++
 2 files changed, 12 insertions(+)

diff --git a/mythplugins/mythgallery/mythgallery/glsingleview.cpp b/mythplugins/mythgallery/mythgallery/glsingleview.cpp
index f0b0f3d..e91f55e 100644
    a b void GLSingleView::CleanUp(void)  
    155155{
    156156    makeCurrent();
    157157
     158    if (m_slideshow_running)
     159    { 
     160        GetMythMainWindow()->PauseIdleTimer(false);
     161        GetMythUI()->RestoreScreensaver();
     162    }
     163
    158164    if (m_slideshow_timer)
    159165    {
    160166        m_slideshow_timer->stop();

  • mythplugins/mythgallery/mythgallery/singleview.cpp 

    diff --git a/mythplugins/mythgallery/mythgallery/singleview.cpp b/mythplugins/mythgallery/mythgallery/singleview.cpp
index e841201..2005d12 100644
    a b SingleView::SingleView(  
    148148
    149149SingleView::~SingleView()
    150150{
     151    if (m_slideshow_running)
     152    {
     153        GetMythMainWindow()->PauseIdleTimer(false);
     154        GetMythUI()->RestoreScreensaver();
     155    }
     156
    151157    if (m_effect_painter)
    152158    {
    153159        if (m_effect_painter->isActive())