Changeset e1773c2cf7 in mythtv


Ignore:
Timestamp:
Jun 17, 2013, 12:21:14 PM (11 years ago)
Author:
Jean-Yves Avenard <jyavenard@…>
Branches:
devel/2020-player, devel/ffmpeg-resync, fixes/0.27, fixes/0.28, fixes/29, fixes/30, fixes/31, github-templates, master
Children:
eb0d243040
Parents:
9b22dab41e
git-author:
Jean-Yves Avenard <jyavenard@…> (06/17/13 12:21:14)
git-committer:
Jean-Yves Avenard <jyavenard@…> (06/18/13 17:44:17)
Message:

Make sure we delete RAOP device in the thread that started it.

Fixes occasional crash at shutdown

Location:
mythtv/libs/libmythtv/AirPlay
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • mythtv/libs/libmythtv/AirPlay/mythraopdevice.cpp

    r9b22dab41e re1773c2cf7  
    5656            gMythRAOPDeviceThread->qthread(), SIGNAL(started()),
    5757            gMythRAOPDevice,                  SLOT(Start()));
     58        QObject::connect(
     59            gMythRAOPDeviceThread->qthread(), SIGNAL(finished()),
     60            gMythRAOPDevice,                  SLOT(Stop()));
    5861        gMythRAOPDeviceThread->start(QThread::LowestPriority);
    5962    }
    … …  
    6770{
    6871    LOG(VB_GENERAL, LOG_INFO, LOC + "Cleaning up.");
    69 
    70     if (gMythRAOPDevice)
    71         gMythRAOPDevice->Teardown();
    7272
    7373    QMutexLocker locker(gMythRAOPDeviceMutex);
    … …  
    9393MythRAOPDevice::~MythRAOPDevice()
    9494{
    95     Teardown();
    96 
    9795    delete m_lock;
    9896    m_lock = NULL;
    … …  
    148146    m_valid = true;
    149147    return;
     148}
     149
     150void MythRAOPDevice::Stop(void)
     151{
     152    Teardown();
    150153}
    151154

  • mythtv/libs/libmythtv/AirPlay/mythraopdevice.h

    r9b22dab41e re1773c2cf7  
    3131  private slots:
    3232    void Start();
     33    void Stop();
    3334    void newConnection(QTcpSocket *client);
    3435    void deleteClient();
Note: See TracChangeset for help on using the changeset viewer.