| 1 | Check the returh of system calls.
|
|---|
| 2 |
|
|---|
| 3 | From: Erik Hovland <erik@hovland.org>
|
|---|
| 4 |
|
|---|
| 5 |
|
|---|
| 6 | ---
|
|---|
| 7 |
|
|---|
| 8 | mythtv/programs/mythfilldatabase/channeldata.cpp | 26 +++++++++++++++-------
|
|---|
| 9 | mythtv/programs/mythfilldatabase/filldata.cpp | 2 +-
|
|---|
| 10 | 2 files changed, 19 insertions(+), 9 deletions(-)
|
|---|
| 11 |
|
|---|
| 12 |
|
|---|
| 13 | diff --git a/mythtv/programs/mythfilldatabase/channeldata.cpp b/mythtv/programs/mythfilldatabase/channeldata.cpp
|
|---|
| 14 | index 61cae33..a35eaaa 100644
|
|---|
| 15 | --- a/mythtv/programs/mythfilldatabase/channeldata.cpp
|
|---|
| 16 | +++ b/mythtv/programs/mythfilldatabase/channeldata.cpp
|
|---|
| 17 | @@ -413,14 +413,24 @@ void ChannelData::handleChannels(int id, QList<ChanInfo> *chanlist)
|
|---|
| 18 | if(channel_preset && cstr.isEmpty())
|
|---|
| 19 | cstr = QString::number(chanid % 1000);
|
|---|
| 20 |
|
|---|
| 21 | - ChannelUtil::CreateChannel(
|
|---|
| 22 | - mplexid, id, chanid,
|
|---|
| 23 | - (*i).callsign, (*i).name, cstr,
|
|---|
| 24 | - 0 /*service id*/, major, minor,
|
|---|
| 25 | - false /*use on air guide*/, false /*hidden*/,
|
|---|
| 26 | - false /*hidden in guide*/,
|
|---|
| 27 | - (*i).freqid, localfile, (*i).tvformat,
|
|---|
| 28 | - (*i).xmltvid);
|
|---|
| 29 | + bool retval = ChannelUtil::CreateChannel(
|
|---|
| 30 | + mplexid, id,
|
|---|
| 31 | + chanid,
|
|---|
| 32 | + (*i).callsign,
|
|---|
| 33 | + (*i).name, cstr,
|
|---|
| 34 | + 0 /*service id*/,
|
|---|
| 35 | + major, minor,
|
|---|
| 36 | + false /*use on air guide*/,
|
|---|
| 37 | + false /*hidden*/,
|
|---|
| 38 | + false /*hidden in guide*/,
|
|---|
| 39 | + (*i).freqid,
|
|---|
| 40 | + localfile,
|
|---|
| 41 | + (*i).tvformat,
|
|---|
| 42 | + (*i).xmltvid
|
|---|
| 43 | + );
|
|---|
| 44 | + if (!retval)
|
|---|
| 45 | + cout << "Channel " << chanid << " creation failed"
|
|---|
| 46 | + << endl;
|
|---|
| 47 | }
|
|---|
| 48 | }
|
|---|
| 49 | }
|
|---|
| 50 | diff --git a/mythtv/programs/mythfilldatabase/filldata.cpp b/mythtv/programs/mythfilldatabase/filldata.cpp
|
|---|
| 51 | index 50b44f5..605c94f 100644
|
|---|
| 52 | --- a/mythtv/programs/mythfilldatabase/filldata.cpp
|
|---|
| 53 | +++ b/mythtv/programs/mythfilldatabase/filldata.cpp
|
|---|
| 54 | @@ -811,7 +811,7 @@ bool FillData::Run(SourceList &sourcelist)
|
|---|
| 55 | QString currDate(qCurrentDate.addDays(i).toString());
|
|---|
| 56 |
|
|---|
| 57 | VERBOSE(VB_GENERAL, ""); // add a space between days
|
|---|
| 58 | - VERBOSE(VB_GENERAL, "Checking day @ " <<
|
|---|
| 59 | + VERBOSE(VB_GENERAL, "Checking day @ " +
|
|---|
| 60 | QString("offset %1, date: %2").arg(i).arg(currDate));
|
|---|
| 61 |
|
|---|
| 62 | bool download_needed = false;
|
|---|
