Skip to content

Commit

Permalink
Remove m_ in class member names for backport to fixes-30
Browse files Browse the repository at this point in the history
Refs #13415
  • Loading branch information
Klaas de Waal committed May 30, 2019
1 parent 57ffe65 commit 6bd8cd4
Showing 1 changed file with 9 additions and 9 deletions.
18 changes: 9 additions & 9 deletions mythtv/libs/libmythtv/recorders/dvbchannel.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -123,9 +123,9 @@ DVBChannel::~DVBChannel()
new_master = dynamic_cast<DVBChannel*>(master_map[key].front());
if (new_master)
{
QMutexLocker master_locker(&(master->m_hw_lock));
QMutexLocker new_master_locker(&(new_master->m_hw_lock));
new_master->m_is_open = master->m_is_open;
QMutexLocker master_locker(&(master->hw_lock));
QMutexLocker new_master_locker(&(new_master->hw_lock));
new_master->is_open = master->is_open;
}
}
else
Expand All @@ -151,10 +151,10 @@ void DVBChannel::Close(DVBChannel *who)
{
LOG(VB_CHANNEL, LOG_INFO, LOC + "Closing DVB channel");

QMutexLocker locker(&m_hw_lock);
QMutexLocker locker(&hw_lock);

IsOpenMap::iterator it = m_is_open.find(who);
if (it == m_is_open.end())
IsOpenMap::iterator it = is_open.find(who);
if (it == is_open.end())
return; // this caller didn't have it open in the first place..

is_open.erase(it);
Expand Down Expand Up @@ -376,9 +376,9 @@ bool DVBChannel::Open(DVBChannel *who)
bool DVBChannel::IsOpen(void) const
{
//Have to acquire the hw lock to prevent is_open being modified whilst we're searching it
QMutexLocker locker(&m_hw_lock);
IsOpenMap::const_iterator it = m_is_open.find(this);
return it != m_is_open.end();
QMutexLocker locker(&hw_lock);
IsOpenMap::const_iterator it = is_open.find(this);
return it != is_open.end();
}

bool DVBChannel::Init(QString &startchannel, bool setchan)
Expand Down

0 comments on commit 6bd8cd4

Please sign in to comment.