472 changes: 0 additions & 472 deletions mythplugins/mythmusic/theme/default-wide/music-ui.xml

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion mythtv/libs/libmythtv/eitscanner.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,7 @@ void EITScanner::StopPassiveScan(void)

void EITScanner::StartActiveScan(TVRec *_rec, uint max_seconds_per_source)
{
rec = _rec;
rec = _rec;

if (!activeScanChannels.size())
{
Expand Down
4 changes: 2 additions & 2 deletions mythtv/libs/libmythtv/mpeg/mpegstreamdata.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -791,14 +791,14 @@ void MPEGStreamData::ProcessPAT(const ProgramAssociationTable *pat)
// After 400ms emit error if we haven't found correct PAT.
LOG(VB_GENERAL, LOG_ERR,
"ProcessPAT: Program not found in PAT. "
"\n\t\t\tRescan your transports.");
"Rescan your transports.");

send_single_program = CreatePATSingleProgram(*pat);
}
else if (foundProgram)
{
if (_invalid_pat_seen)
LOG(VB_RECORD, LOG_INFO,
LOG(VB_RECORD, LOG_INFO,
"ProcessPAT: Good PAT seen after a bad PAT");

_invalid_pat_seen = false;
Expand Down
2 changes: 1 addition & 1 deletion mythtv/libs/libmythtv/mythraopconnection.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -319,7 +319,7 @@ void MythRAOPConnection::ProcessSyncPacket(const QByteArray &buf, uint64_t timen

if (m_audio)
{
LOG(VB_GENERAL, LOG_INFO, LOC +
LOG(VB_GENERAL, LOG_DEBUG, LOC +
QString("Sync packet: Timestamp: %1 Current Audio ts: %2 (avsync %3ms) "
"Latency: audio %4 queue %5 total %6ms <-> target %7ms")
.arg(m_lastSyncTimestamp).arg(m_audio->GetAudiotime()).arg(averageav, 0)
Expand Down
2 changes: 1 addition & 1 deletion mythtv/libs/libmythui/mythuitype.h
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ class MUI_PUBLIC MythUIType : public QObject, public XMLParseBase
virtual QSize GetMinSize(void) const;
virtual void SetArea(const MythRect &rect);
virtual void AdjustMinArea(int delta_x, int delta_y,
int delta_w, int delta_h);
int delta_w, int delta_h);
virtual void VanishSibling(void);
virtual void SetMinAreaParent(MythRect actual_area, MythRect full_area,
MythUIType *child);
Expand Down