537 changes: 332 additions & 205 deletions mythtv/libs/libmyth/uitypes.cpp
View file

Large diffs are not rendered by default.

5 changes: 4 additions & 1 deletion mythtv/libs/libmyth/xmlparse.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,10 @@ bool XMLParse::doLoadTheme(QDomElement &ele, QString winName, QString themeFile)

if (!f.open(QIODevice::ReadOnly))
{
//cerr << "XMLParse::LoadTheme(): Can't open: " << themeFile << endl;
#if 0
VERBOSE(VB_IMPORTANT, "XMLParse::LoadTheme(): Can't open: " +
themeFile);
#endif
return false;
}

Expand Down
22 changes: 11 additions & 11 deletions mythtv/libs/libmythbase/httpcomms.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -781,14 +781,14 @@ bool HttpComms::createDigestAuth ( bool isForProxy, const QString& authStr, QHtt

info.digestURI.append (m_url.path() + m_url.encodedQuery());


// cerr << " RESULT OF PARSING:" << endl;
// cerr << " algorithm: " << info.algorithm << endl;
// cerr << " realm: " << info.realm << endl;
// cerr << " nonce: " << info.nonce << endl;
// cerr << " opaque: " << opaque << endl;
// cerr << " qop: " << info.qop << endl;

#if 0
VERBOSE(VB_GENERAL, " RESULT OF PARSING:");
VERBOSE(VB_GENERAL, QString(" algorithm: ") .arg(info.algorithm));
VERBOSE(VB_GENERAL, QString(" realm: ") .arg(info.realm));
VERBOSE(VB_GENERAL, QString(" nonce: ") .arg(info.nonce));
VERBOSE(VB_GENERAL, QString(" opaque: ") .arg(opaque));
VERBOSE(VB_GENERAL, QString(" qop: ") .arg(info.qop));
#endif

// Calculate the response...
calculateDigestResponse( info, Response );
Expand Down Expand Up @@ -869,7 +869,7 @@ void HttpComms::calculateDigestResponse( DigestAuthInfo& info, QByteArray& Respo

HA1 = md.hexDigest();

//cerr << " calculateResponse(): A1 => " << HA1 << endl;
//VERBOSE(VB_GENERAL, QString(" calculateResponse(): A1 => %1") .arg(HA1));

QString sEncodedPathAndQuery = m_url.path() + m_url.encodedQuery();

Expand All @@ -888,7 +888,7 @@ void HttpComms::calculateDigestResponse( DigestAuthInfo& info, QByteArray& Respo
md.update( authStr );
HA2 = md.hexDigest();

//cerr << " calculateResponse(): A2 => " << HA2 << endl;
//VERBOSE(VB_GENERAL, QString(" calculateResponse(): A2 => %1") .arg(HA2));

// Calculate the response.
authStr = HA1;
Expand All @@ -910,7 +910,7 @@ void HttpComms::calculateDigestResponse( DigestAuthInfo& info, QByteArray& Respo
md.update( authStr );
Response = md.hexDigest();

//cerr << " calculateResponse(): Response => " << Response << endl;
//VERBOSE(VB_GENERAL, QString(" calculateResponse(): Response => %1") .arg(Response));
}


7 changes: 5 additions & 2 deletions mythtv/libs/libmythtv/avformatdecoder.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2575,8 +2575,11 @@ void AvFormatDecoder::HandleGopStart(
last_frame = m_positionMap.back().index;
}

//cerr << "framesRead: " << framesRead << " last_frame: " << last_frame
// << " keyframedist: " << keyframedist << endl;
#if 0
VERBOSE(VB_PLAYBACK, QString("framesRead: %1 last_frame: %2 "
"keyframedist: %3")
.arg(framesRead) .arg(last_frame) .arg(keyframedist));
#endif

// if we don't have an entry, fill it in with what we've just parsed
if (framesRead > last_frame && keyframedist > 0)
Expand Down
6 changes: 5 additions & 1 deletion mythtv/libs/libmythtv/channelscan/channelscan_sm.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -540,7 +540,11 @@ bool ChannelScanSM::TestNextProgramEncryption(void)
{
uint pnum = 0;
QMap<uint, uint>::const_iterator it = currentEncryptionStatus.begin();
//cerr << currentEncryptionStatusChecked.size() << "/" << currentEncryptionStatus.size() << " checked" << endl;
#if 0
VERBOSE(VB_GENERAL, QString("%1/%2 checked")
.arg(currentEncryptionStatusChecked.size())
.arg(currentEncryptionStatus.size()));
#endif
while (it != currentEncryptionStatus.end())
{
if (!currentEncryptionStatusChecked[it.key()])
Expand Down
32 changes: 16 additions & 16 deletions mythtv/libs/libmythtv/datadirect.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -423,7 +423,7 @@ bool DDStructureParser::endDocument()

bool DDStructureParser::characters(const QString& pchars)
{
// cerr << "Characters : " << pchars << "\n";
// VERBOSE(VB_GENERAL, "Characters : " + pchars);
if (pchars.trimmed().isEmpty())
return true;

Expand Down Expand Up @@ -833,7 +833,7 @@ void DataDirectProcessor::DataDirectProgramUpdate(void)
{
MSqlQuery query(MSqlQuery::DDCon());

//cerr << "Adding rows to main program table from view table..\n";
//VERBOSE(VB_GENERAL, "Adding rows to main program table from view table");
query.prepare(
"INSERT IGNORE INTO program "
" ( chanid, starttime, endtime, title, "
Expand Down Expand Up @@ -870,8 +870,8 @@ void DataDirectProcessor::DataDirectProgramUpdate(void)
if (!query.exec())
MythDB::DBError("Inserting into program table", query);

//cerr << "Finished adding rows to main program table...\n";
//cerr << "Adding program ratings...\n";
//VERBOSE(VB_GENERAL, "Finished adding rows to main program table");
//VERBOSE(VB_GENERAL, "Adding program ratings");

if (!query.exec("INSERT IGNORE INTO programrating (chanid, starttime, "
"system, rating) SELECT dd_v_program.chanid, "
Expand All @@ -890,8 +890,8 @@ void DataDirectProcessor::DataDirectProgramUpdate(void)
" AND dd_v_program.chanid = channel.chanid"))
MythDB::DBError("Inserting into programrating table", query);

//cerr << "Finished adding program ratings...\n";
//cerr << "Populating people table from production crew list...\n";
//VERBOSE(VB_GENERAL, "Finished adding program ratings");
//VERBOSE(VB_GENERAL, "Populating people table from production crew list");

if (!query.exec("INSERT IGNORE INTO people (name) "
"SELECT fullname "
Expand All @@ -901,8 +901,8 @@ void DataDirectProcessor::DataDirectProgramUpdate(void)
"WHERE people.name IS NULL;"))
MythDB::DBError("Inserting into people table", query);

//cerr << "Finished adding people...\n";
//cerr << "Adding credits entries from production crew list...\n";
//VERBOSE(VB_GENERAL, "Finished adding people");
//VERBOSE(VB_GENERAL, "Adding credits entries from production crew list");

if (!query.exec("INSERT IGNORE INTO credits (chanid, starttime, person, role)"
"SELECT dd_v_program.chanid, "
Expand All @@ -924,8 +924,8 @@ void DataDirectProcessor::DataDirectProgramUpdate(void)
"WHERE credits.role IS NULL;"))
MythDB::DBError("Inserting into credits table", query);

//cerr << "Finished inserting credits...\n";
//cerr << "Adding genres...\n";
//VERBOSE(VB_GENERAL, "Finished inserting credits");
//VERBOSE(VB_GENERAL, "Adding genres");

if (!query.exec("INSERT IGNORE INTO programgenres (chanid, starttime, "
"relevance, genre) SELECT dd_v_program.chanid, "
Expand All @@ -935,7 +935,7 @@ void DataDirectProcessor::DataDirectProgramUpdate(void)
"AND dd_v_program.chanid = channel.chanid"))
MythDB::DBError("Inserting into programgenres table",query);

//cerr << "Done...\n";
//VERBOSE(VB_GENERAL, "Done");
}

bool DataDirectProcessor::DDPost(
Expand Down Expand Up @@ -1961,7 +1961,7 @@ bool DataDirectProcessor::ParseLineups(const QString &documentFile)
in_form = true;
get_action = get_setting(line.mid(frm + 5), "action");
name_value.clear();
//cerr<<QString("action: %1").arg(action)<<endl;
//VERBOSE(VB_GENERAL, QString("action: %1").arg(action));
}

if (!in_form)
Expand All @@ -1971,11 +1971,11 @@ bool DataDirectProcessor::ParseLineups(const QString &documentFile)
if (inp >= 0)
{
QString input_line = line.mid(inp + 6);
//cerr<<QString("input: %1").arg(input_line)<<endl;
//VERBOSE(VB_GENERAL, QString("input: %1").arg(input_line));
QString name = get_setting(input_line, "name");
QString value = get_setting(input_line, "value");
//cerr<<QString("name: %1").arg(name)<<endl;
//cerr<<QString("value: %1").arg(value)<<endl;
//VERBOSE(VB_GENERAL, QString("name: %1").arg(name));
//VERBOSE(VB_GENERAL, QString("value: %1").arg(value));
if (!name.isEmpty() && !value.isEmpty())
name_value[name] = value;
}
Expand Down Expand Up @@ -2034,7 +2034,7 @@ bool DataDirectProcessor::ParseLineup(const QString &lineupid,
{
in_form = true;
lineup.set_action = get_setting(line.mid(frm + 5), "action");
//cerr<<"set_action: "<<lineup.set_action<<endl;
//VERBOSE(VB_GENERAL "set_action: " + lineup.set_action);
}

if (!in_form)
Expand Down
16 changes: 9 additions & 7 deletions mythtv/libs/libmythtv/mpeg/H264Parser.cpp
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
// MythTV headers
#include "H264Parser.h"
#include <iostream>
#include "mythverbose.h"

extern "C" {
// from libavcodec
Expand Down Expand Up @@ -338,8 +339,8 @@ bool H264Parser::fillRBSP(const uint8_t *byteP, uint32_t byte_count,
if (new_buffer == NULL)
{
/* Allocation failed. Discard the new bytes */
std::cerr << "H264Parser::fillRBSP: "
<< "FAILED to allocate RBSP buffer!\n";
VERBOSE(VB_GENERAL, "H264Parser::fillRBSP: "
"FAILED to allocate RBSP buffer!");
return false;
}

Expand Down Expand Up @@ -382,9 +383,10 @@ bool H264Parser::fillRBSP(const uint8_t *byteP, uint32_t byte_count,
else
{
/* This should never happen. */
std::cerr << "H264Parser::fillRBSP: "
<< "Found start code, rbsp_index is "
<< rbsp_index << " but it should be >4\n";
VERBOSE(VB_GENERAL, QString("H264Parser::fillRBSP: "
"Found start code, rbsp_index is %1 "
"but it should be >4")
.arg(rbsp_index));
}
}

Expand Down Expand Up @@ -437,8 +439,8 @@ uint32_t H264Parser::addBytes(const uint8_t *bytes,
* parsing the previous NAL. Either there's a
* problem with the stream or with this parser.
*/
std::cerr << "H264Parser::addBytes: Found new start code, "
<< "but previous NAL is incomplete!\n";
VERBOSE(VB_GENERAL, "H264Parser::addBytes: Found new start "
"code, but previous NAL is incomplete!");
}

/* Prepare for accepting the new NAL */
Expand Down
6 changes: 4 additions & 2 deletions mythtv/libs/libmythtv/mpeg/atscdescriptors.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -137,8 +137,10 @@ QString MultipleStringStructure::Uncompressed(
(0x30<=mode && mode<=0x33)) { // basic runlength encoding
int hb=mode<<8;
for (int j=0; j<len; j++) {
//cerr<<"str.append(0x"<<hex<<mode<<":0x"<<int(buf[j])<<") -> "
//<<QChar(hb|buf[j])<<endl;
#if 0
VERBOSE(VB_GENERAL, QString("str.append(0x%1:0x%2) -> %3")
.arg(mode, 0, 16) .arg(buf[j], 0, 16) .arg(QChar(hb|buf[j])));
#endif
str.append( QChar( hb|buf[j] ) );
}
} else if (mode==0x3e) {
Expand Down
2 changes: 1 addition & 1 deletion mythtv/libs/libmythtv/mpeg/mpegdescriptors.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,7 @@ class RegistrationDescriptor : public MPEGDescriptor
assert(DescriptorID::registration == DescriptorTag());
if (0x04 != DescriptorLength())
{
//cerr<<"Registration Descriptor length != 4 !!!!"<<endl;
//VERBOSE(VB_GENERAL, "Registration Descriptor length != 4 !!!!");
}
}

Expand Down
10 changes: 6 additions & 4 deletions mythtv/libs/libmythtv/mpeg/mpegstreamdata.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,12 @@ void init_sections(sections_t &sect, uint last_section)
sect[endz] = init_bits[last_section & 0x7];

#if 0
cerr<<"init_sections ls("<<last_section<<"): "<<hex;
for (uint i = 0 ; i < 32; i++)
cerr<<((int)sect[i])<<" ";
cerr<<dec<<endl;
{
QString msg = QString("init_sections ls(%1): ").arg(last_section);
for (uint i = 0 ; i < 32; i++)
msg += QString("%1 ").arg((int)sect[i], 0, 16);
VERBOSE(VB_GENERAL, msg);
}
#endif
}

Expand Down
15 changes: 8 additions & 7 deletions mythtv/libs/libmythtv/mpeg/pespacket.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -259,7 +259,7 @@ static void return_188_block(unsigned char* ptr)
free(*it);
mem188.clear();
free188.clear();
//cerr<<"freeing all 188 blocks"<<endl;
//VERBOSE(VB_GENERAL, "freeing all 188 blocks");
}
}

Expand Down Expand Up @@ -293,19 +293,20 @@ static void return_4096_block(unsigned char* ptr)
free4096.push_back(ptr);

#if 0 // enable this to debug memory leaks
cerr<<alloc4096.size()<<" 4096 blocks remain"<<endl;
VERBOSE(VB_GENERAL, QString("%1 4096 blocks remain")
.arg(alloc4096.size()));
map<unsigned char*, bool>::iterator it;
for (it = alloc4096.begin(); it != alloc4096.end(); ++it)
{
TSPacket *ts = (TSPacket*) it->first;
cerr<<QString("PES Packet: pid(0x%1)").arg(ts->PID(),0,16);
VERBOSE(VB_GENERAL, QString("PES Packet: pid(0x%1)")
.arg(ts->PID(),0,16));
if (ts->PID() == 0x1ffb)
{
cerr<<QString(" tid(0x%1) ext(0x%2)")
VERBOSE(VB_GENERAL, QString(" tid(0x%1) ext(0x%2)")
.arg(PSIPTable::View(*ts).TableID(),0,16)
.arg(PSIPTable::View(*ts).TableIDExtension(),0,16);
.arg(PSIPTable::View(*ts).TableIDExtension(),0,16));
}
cerr<<endl;
}
#endif

Expand All @@ -317,7 +318,7 @@ static void return_4096_block(unsigned char* ptr)
free(*it);
mem4096.clear();
free4096.clear();
//cerr<<"freeing all 4096 blocks"<<endl;
//VERBOSE(VB_GENERAL, "freeing all 4096 blocks");
}
}

Expand Down
4 changes: 2 additions & 2 deletions mythtv/libs/libmythtv/signalmonitor.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ extern "C" {

static void ALRMhandler(int /*sig*/)
{
cerr<<"SignalMonitor: Got SIGALRM"<<endl;
VERBOSE(VB_GENERAL, "SignalMonitor: Got SIGALRM");
signal(SIGINT, ALRMhandler);
}

Expand Down Expand Up @@ -322,7 +322,7 @@ void SignalMonitor::MonitorLoop()
QStringList slist = GetStatusList(false);
MythEvent me(QString("SIGNAL %1").arg(capturecardnum), slist);
gCoreContext->dispatch(me);
//cerr<<"sent SIGNAL"<<endl;
//VERBOSE(VB_GENERAL("sent SIGNAL");
}

usleep(update_rate * 1000);
Expand Down
31 changes: 18 additions & 13 deletions mythtv/libs/libmythtv/signalmonitorvalue.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,11 @@ SignalMonitorValue::SignalMonitorValue(const QString& _name,

Init();
#if DEBUG_SIGNAL_MONITOR_VALUE
cerr<<"SignalMonitorValue("<<name<<", "<<noSpaceName<<", "<<value<<", "
<<threshold<<", "<<minval<<", "<<maxval<<", "<<timeout<<", "
<<high_threshold<<", "<< ((set) ? "true" : "false") <<")"<<endl;
VERBOSE(VB_GENERAL, QString("SignalMonitorValue(%1, %2, %3, %4, %5, %6, %7,"
" %8, %9)")
.arg(name) .arg(noSpaceName) .arg(value) .arg(threshold) .arg(minval)
.arg(maxval) .arg(timeout) .arg(high_threshold)
.arg((set ? "true" : "false")));
#endif
}

Expand All @@ -73,9 +75,11 @@ SignalMonitorValue::SignalMonitorValue(const QString& _name,

Init();
#if DEBUG_SIGNAL_MONITOR_VALUE
cerr<<"SignalMonitorValue("<<name<<", "<<noSpaceName<<", "<<value<<", "
<<threshold<<", "<<minval<<", "<<maxval<<", "<<timeout<<", "
<<high_threshold<<", "<< ((set) ? "true" : "false") <<")"<<endl;
VERBOSE(VB_GENERAL, QString("SignalMonitorValue(%1, %2, %3, %4, %5, %6, %7,"
" %8, %9)")
.arg(name) .arg(noSpaceName) .arg(value) .arg(threshold) .arg(minval)
.arg(maxval) .arg(timeout) .arg(high_threshold)
.arg((set ? "true" : "false")));
#endif
}

Expand Down Expand Up @@ -161,7 +165,7 @@ SignalMonitorList SignalMonitorValue::Parse(const QStringList& slist)
for (int i=0; i+1<slist.size(); i+=2)
{
#if DEBUG_SIGNAL_MONITOR_VALUE
cerr<<"Parse("<<slist[i]<<", ("<<slist[i+1]<<"))"<<endl;
VERBOSE(VB_GENERAL, "Parse(" + slist[i] + ", (" + slist[i+1] + "))");
#endif
if (smv.Set(slist[i], slist[i+1]))
monitor_list.push_back(smv);
Expand Down Expand Up @@ -189,17 +193,18 @@ bool SignalMonitorValue::AllGood(const SignalMonitorList& slist)
#if DEBUG_SIGNAL_MONITOR_VALUE
if (!good)
{
cerr<<"AllGood failed on ";
QString msg("AllGood failed on ");
SignalMonitorList::const_iterator it = slist.begin();
for (; it != slist.end(); ++it)
if (!it->IsGood())
{
QByteArray ba = it->noSpaceName.toLocal8Bit();
cerr<<ba.data()<<"("<<it->GetValue()
<<((it->high_threshold) ? "<" : ">")
<<it->GetThreshold()<<") ";
msg += it->noSpaceName;
msg += QString("(%1%2%3) ")
.arg(it->GetValue())
.arg(it->high_threshold ? "<" : ">")
.arg(it->GetThreshold());
}
cerr<<endl;
VERBOSE(VB_GENERAL, msg);
}
#endif
return good;
Expand Down
6 changes: 4 additions & 2 deletions mythtv/libs/libmythtv/util-xv.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
using namespace std;

// MythTH headers
#include "mythverbose.h"
#include "mythxdisplay.h"
#include "util-xv.h"

Expand All @@ -21,12 +22,13 @@ QMap<int,port_info> open_xv_ports;

void close_all_xv_ports_signal_handler(int sig)
{
cerr<<"Signal: "<<sys_siglist[sig]<<endl;
VERBOSE(VB_GENERAL, QString("Signal: %1").arg(sys_siglist[sig]));
QMap<int,port_info>::iterator it;
for (it = open_xv_ports.begin(); it != open_xv_ports.end(); ++it)
{
restore_port_attributes((*it).port);
cerr<<"Ungrabbing XVideo port: "<<(*it).port<<endl;
VERBOSE(VB_GENERAL, QString("Ungrabbing XVideo port: %1")
.arg((*it).port));
XvUngrabPort((*it).disp->GetDisplay(), (*it).port, CurrentTime);
}
exit(GENERIC_EXIT_NOT_OK);
Expand Down
17 changes: 8 additions & 9 deletions mythtv/libs/libmythtv/videoout_xv.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1550,15 +1550,14 @@ static void calc_bob(FrameScanType scan, int imgh, int disphoff,

if (last_dest_y != dest_y)
{
cerr<<"####### Field "<<field<<" #######"<<endl;
cerr<<" src_y: "<<src_y<<endl;
cerr<<" dest_y: "<<dest_y<<endl;
cerr<<" xv_src_y_incr: "<<xv_src_y_incr<<endl;
cerr<<"xv_dest_y_incr: "<<xv_dest_y_incr<<endl;
cerr<<" disphoff: "<<disphoff<<endl;
cerr<<" imgh: "<<imgh<<endl;
cerr<<" mod: "<<mod<<endl;
cerr<<endl;
VERBOSE(VB_GENERAL, QString("####### Field %1 #######").arg(field));
VERBOSE(VB_GENERAL, QString(" src_y: %1").arg(src_y));
VERBOSE(VB_GENERAL, QString(" dest_y: %1").arg(dest_y));
VERBOSE(VB_GENERAL, QString(" xv_src_y_incr: %1").arg(xv_src_y_incr));
VERBOSE(VB_GENERAL, QString("xv_dest_y_incr: %1").arg(xv_dest_y_incr));
VERBOSE(VB_GENERAL, QString(" disphoff: %1").arg(disphoff));
VERBOSE(VB_GENERAL, QString(" imgh: %1").arg(imgh));
VERBOSE(VB_GENERAL, QString(" mod: %1").arg(mod));
}
last_dest_y_field[field] = dest_y;
#endif
Expand Down
13 changes: 7 additions & 6 deletions mythtv/libs/libmythtv/vsync.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ int VideoSync::CalcDelay()
*/
void VideoSync::KeepPhase()
{
// cerr << m_delay << endl;
// VERBOSE(VB_GENERAL, QString("%1").arg(m_delay));
if (m_delay < -(m_refresh_interval/2))
m_nexttrigger += 200;
else if (m_delay > -500)
Expand Down Expand Up @@ -287,7 +287,7 @@ int DRMVideoSync::WaitForFrame(int sync_delay)
m_nexttrigger += sync_delay;

m_delay = CalcDelay();
//cerr << "WaitForFrame at : " << m_delay;
//VERBOSE(VB_GENERAL, QString("WaitForFrame at : %1").arg(m_delay));

// Always sync to the next retrace execpt when we are very late.
if (m_delay > -(m_refresh_interval/2))
Expand All @@ -297,9 +297,8 @@ int DRMVideoSync::WaitForFrame(int sync_delay)
blank.request.sequence = 1;
drmWaitVBlank(m_dri_fd, &blank);
m_delay = CalcDelay();
// cerr << "\tDelay at sync: " << m_delay;
//VERBOSE(VB_GENERAL, QString("Delay at sync: %1").arg(m_delay));
}
//cerr << endl;

if (m_delay > 0)
{
Expand All @@ -311,8 +310,10 @@ int DRMVideoSync::WaitForFrame(int sync_delay)
blank.request.sequence = n;
drmWaitVBlank(m_dri_fd, &blank);
m_delay = CalcDelay();
//cerr << "Wait " << n << " intervals. Count " << blank.request.sequence;
//cerr << " Delay " << m_delay << endl;
#if 0
VERBOSE(VB_GENERAL, QString("Wait %1 intervals. Count %2 Delay %3")
.arg(n) .arg(blank.request.sequence) .arg(m_delay));
#endif
}

return m_delay;
Expand Down
7 changes: 2 additions & 5 deletions mythtv/libs/libmythui/DisplayResX.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,6 @@

#include <X11/extensions/Xrandr.h> // this has to be after util-x11.h (Qt bug)

using std::cerr;
using std::endl;

static XRRScreenConfiguration *GetScreenConfig(MythXDisplay*& display);

DisplayResX::DisplayResX(void)
Expand Down Expand Up @@ -82,10 +79,10 @@ bool DisplayResX::SwitchToVideoMode(int width, int height, double desired_rate)
delete display;

if (RRSetConfigSuccess != status)
cerr<<"DisplaResX: XRRSetScreenConfigAndRate() call failed."<<endl;
VERBOSE(VB_GENERAL, "XRRSetScreenConfigAndRate() call failed.");
return RRSetConfigSuccess == status;
}
cerr<<"DisplaResX: Desired Resolution and FrameRate not found."<<endl;
VERBOSE(VB_GENERAL, "Desired Resolution and FrameRate not found.");
return false;
}

Expand Down
8 changes: 6 additions & 2 deletions mythtv/libs/libmythupnp/bufferedsocketdevice.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -210,8 +210,12 @@ int BufferedSocketDevice::ReadBytes()

if (a)
{
// for( long n = 0; n < a->count(); n++ )
// cerr << a->at( n );
#if 0
QString msg;
for( long n = 0; n < a->count(); n++ )
msg += QString("%1").arg(a->at(n));
VERBOSE(VB_GENERAL, msg);
#endif

m_bufRead.append( a );
}
Expand Down
6 changes: 4 additions & 2 deletions mythtv/libs/libmythupnp/ssdp.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -219,13 +219,15 @@ void SSDP::PerformSearch( const QString &sST )

if ( pSocket->writeBlock( sRequest.data(),
sRequest.size(), address, SSDP_PORT ) != nSize)
cerr << "SSDP::PerformSearch - did not write entire buffer." << endl;
VERBOSE(VB_GENERAL, "SSDP::PerformSearch - did not write entire "
"buffer.");

usleep( rand() % 250000 );

if ( pSocket->writeBlock( sRequest.data(),
sRequest.size(), address, SSDP_PORT ) != nSize)
cerr << "SSDP::PerformSearch - did not write entire buffer." << endl;
VERBOSE(VB_GENERAL, "SSDP::PerformSearch - did not write entire "
"buffer.");

}

Expand Down
5 changes: 2 additions & 3 deletions mythtv/libs/libmythupnp/taskqueue.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,6 @@

#include <iostream>

using std::cerr;

/////////////////////////////////////////////////////////////////////////////
// Define Global instance
/////////////////////////////////////////////////////////////////////////////
Expand Down Expand Up @@ -137,7 +135,8 @@ void TaskQueue::run( )
}
catch( ... )
{
cerr << "TaskQueue::run - Call to Execute threw an exception.";
VERBOSE(VB_GENERAL, "TaskQueue::run - Call to Execute threw "
"an exception.");
}

}
Expand Down
3 changes: 2 additions & 1 deletion mythtv/programs/mythbackend/encoderlink.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,8 @@ TVState EncoderLink::GetState(void)
else if (sock)
retval = (TVState)sock->GetEncoderState(m_capturecardnum);
else
cerr << "Broken for card: " << m_capturecardnum << endl;
VERBOSE(VB_GENERAL, QString("Broken for card: %1")
.arg(m_capturecardnum));

return retval;
}
Expand Down
3 changes: 2 additions & 1 deletion mythtv/programs/mythbackend/httpstatus.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,8 @@ bool HttpStatus::ProcessRequest( HttpWorkerThread * /* pThread */,
}
catch( ... )
{
cerr << "HttpStatus::ProcessRequest() - Unexpected Exception" << endl;
VERBOSE(VB_GENERAL, "HttpStatus::ProcessRequest() - Unexpected "
"Exception");
}

return( false );
Expand Down
2 changes: 1 addition & 1 deletion mythtv/programs/mythbackend/mainserver.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -328,7 +328,7 @@ void MainServer::ProcessRequestWork(MythSocket *sock)
line = line.simplified();
QStringList tokens = line.split(' ', QString::SkipEmptyParts);
QString command = tokens[0];
//cerr << "command='" << command << "'\n";
//VERBOSE(VB_GENERAL, "command='" + command + "'");
if (command == "MYTH_PROTO_VERSION")
{
if (tokens.size() < 2)
Expand Down
4 changes: 2 additions & 2 deletions mythtv/programs/mythfilldatabase/filldata.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -277,9 +277,9 @@ bool FillData::GrabDDData(Source source, int poffset,
channel_update_run = true;
}

//cerr << "Creating program view table...\n";
//VERBOSE(VB_GENERAL, "Creating program view table...");
DataDirectProcessor::UpdateProgramViewTable(source.id);
//cerr << "Finished creating program view table...\n";
//VERBOSE(VB_GENERAL, "Finished creating program view table...");

query.prepare("SELECT count(*) from dd_v_program;");
if (query.exec() && query.size() > 0)
Expand Down