4 changes: 2 additions & 2 deletions mythtv/libs/libmythtv/recorders/satipstreamhandler.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
#include "satipchannel.h"
#include "satipstreamhandler.h"

#define LOC QString("SatIPSH[%1](%2): ").arg(m_inputId).arg(m_device)
#define LOC QString("SatIPSH[%1]: ").arg(m_inputId)

QMap<QString, SatIPStreamHandler*> SatIPStreamHandler::s_handlers;
QMap<QString, uint> SatIPStreamHandler::s_handlersRefCnt;
Expand Down Expand Up @@ -104,9 +104,9 @@ void SatIPStreamHandler::Return(SatIPStreamHandler * & ref, int inputid)

SatIPStreamHandler::SatIPStreamHandler(const QString &device, int inputid)
: StreamHandler(device, inputid)
, m_rtsp(new SatIPRTSP(this))
, m_inputId(inputid)
, m_device(device)
, m_rtsp(new SatIPRTSP(this))
{
setObjectName("SatIPStreamHandler");

Expand Down
8 changes: 4 additions & 4 deletions mythtv/libs/libmythtv/recorders/satipstreamhandler.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,11 +55,8 @@ class SatIPStreamHandler : public StreamHandler
static QMap<QString, uint> s_handlersRefCnt;
static QMutex s_handlersLock;

protected:
SatIPRTSP *m_rtsp {nullptr};

public:
int m_inputId;
int m_inputId {0};

private:
DTVTunerType m_tunerType;
Expand All @@ -71,6 +68,9 @@ class SatIPStreamHandler : public StreamHandler
bool m_setupinvoked {false};
QMutex m_tunelock {QMutex::Recursive};
QStringList m_oldpids;

protected:
SatIPRTSP *m_rtsp {nullptr};
};

#endif // _SATIPSTREAMHANDLER_H_