diff --git a/mythtv/libs/libmythtv/diseqc.cpp b/mythtv/libs/libmythtv/diseqc.cpp
index 24da65e..83bd762 100644
a
|
b
|
DiSEqCDevTrees DiSEqCDev::m_trees; |
247 | 247 | */ |
248 | 248 | DiSEqCDevTree *DiSEqCDev::FindTree(uint cardid) |
249 | 249 | { |
| 250 | LOG(VB_CHANNEL, LOG_INFO, LOC + |
| 251 | QString("### DiSEqCDev::FindTree()cardid = %1").arg(cardid)); |
250 | 252 | return m_trees.FindTree(cardid); |
251 | 253 | } |
252 | 254 | |
… |
… |
DiSEqCDevTrees::~DiSEqCDevTrees() |
276 | 278 | */ |
277 | 279 | DiSEqCDevTree *DiSEqCDevTrees::FindTree(uint cardid) |
278 | 280 | { |
| 281 | LOG(VB_CHANNEL, LOG_INFO, LOC + |
| 282 | QString("### DiSEqCDevTrees::FindTree() cardid = %1").arg(cardid)); |
| 283 | |
279 | 284 | QMutexLocker lock(&m_trees_lock); |
280 | 285 | |
281 | 286 | cardid_to_diseqc_tree_t::iterator it = m_trees.find(cardid); |
282 | 287 | if (it != m_trees.end()) |
| 288 | { |
| 289 | LOG(VB_CHANNEL, LOG_INFO, LOC + |
| 290 | QString("### DiSEqCDevTrees::FindTree() found existing tree")); |
283 | 291 | return *it; |
| 292 | } |
284 | 293 | |
285 | 294 | DiSEqCDevTree *tree = new DiSEqCDevTree; |
286 | 295 | tree->Load(cardid); |
… |
… |
DiSEqCDevTree::~DiSEqCDevTree() |
330 | 339 | */ |
331 | 340 | bool DiSEqCDevTree::Load(uint cardid) |
332 | 341 | { |
| 342 | LOG(VB_CHANNEL, LOG_INFO, LOC + |
| 343 | QString("### DiSEqCDevTree::Load() cardid = %1").arg(cardid)); |
| 344 | |
333 | 345 | // clear children |
334 | 346 | delete m_root; |
335 | 347 | m_delete.clear(); |
… |
… |
bool DiSEqCDevTree::Load(uint cardid) |
349 | 361 | } |
350 | 362 | else if (!query.next()) |
351 | 363 | { |
| 364 | LOG(VB_CHANNEL, LOG_INFO, LOC + |
| 365 | QString("### DiSEqCDevSettings::Load() no results found")); |
352 | 366 | return m_root; |
353 | 367 | } |
354 | 368 | |
| 369 | LOG(VB_CHANNEL, LOG_INFO, LOC + |
| 370 | QString("### DiSEqCDevSettings::Load() result = %1") |
| 371 | .arg(query.value(0).toUInt())); |
355 | 372 | if (query.value(0).toUInt()) |
356 | 373 | { |
357 | 374 | m_root = DiSEqCDevDevice::CreateById( |
… |
… |
bool DiSEqCDevTree::Load(uint cardid) |
362 | 379 | LOG(VB_GENERAL, LOG_WARNING, LOC + |
363 | 380 | QString("No device tree for cardid %1").arg(cardid)); |
364 | 381 | } |
| 382 | LOG(VB_CHANNEL, LOG_INFO, LOC + |
| 383 | QString("### DiSEqCDevSettings::Load() m_root = %1") |
| 384 | .arg((uint64_t)m_root, 0, 16)); |
365 | 385 | |
366 | 386 | return m_root; |
367 | 387 | } |
… |
… |
DiSEqCDevDevice *DiSEqCDevDevice::FindDevice(uint dev_id) |
886 | 906 | |
887 | 907 | DiSEqCDevDevice *DiSEqCDevDevice::CreateById(DiSEqCDevTree &tree, uint devid) |
888 | 908 | { |
| 909 | LOG(VB_CHANNEL, LOG_INFO, LOC + |
| 910 | QString("### DiSEqCDevDevice::CreateById() devid = %1").arg(devid)); |
| 911 | |
889 | 912 | // load settings from DB |
890 | 913 | MSqlQuery query(MSqlQuery::InitCon()); |
891 | 914 | query.prepare( |
… |
… |
DiSEqCDevDevice *DiSEqCDevDevice::CreateById(DiSEqCDevTree &tree, uint devid) |
907 | 930 | return NULL; |
908 | 931 | } |
909 | 932 | |
| 933 | LOG(VB_CHANNEL, LOG_INFO, LOC + |
| 934 | QString("### DiSEqCDevDevice::CreateById() results = %1, %2") |
| 935 | .arg(query.value(0).toString()).arg(query.value(1).toString())); |
| 936 | |
910 | 937 | dvbdev_t type = DevTypeFromString(query.value(0).toString()); |
911 | 938 | QString desc = query.value(1).toString(); |
912 | 939 | DiSEqCDevDevice *node = CreateByType(tree, type, devid); |
913 | 940 | |
| 941 | LOG(VB_CHANNEL, LOG_INFO, LOC + |
| 942 | QString("### DiSEqCDevDevice::CreateById() results = %1, %2") |
| 943 | .arg((uint64_t)node, 0, 16)); |
| 944 | |
914 | 945 | if (node) |
915 | 946 | { |
916 | 947 | node->SetDescription(desc); |
diff --git a/mythtv/libs/libmythtv/recorders/dvbchannel.cpp b/mythtv/libs/libmythtv/recorders/dvbchannel.cpp
index 9564b05..49c89cf 100644
a
|
b
|
bool DVBChannel::Open(DVBChannel *who) |
269 | 269 | QString("Using DVB card %1, with frontend '%2'.") |
270 | 270 | .arg(device).arg(frontend_name)); |
271 | 271 | |
| 272 | LOG(VB_CHANNEL, LOG_INFO, LOC + |
| 273 | QString("### tunerType.IsDiSEqCSupported() = %1") |
| 274 | .arg(tunerType.IsDiSEqCSupported())); |
272 | 275 | // Turn on the power to the LNB |
273 | 276 | if (tunerType.IsDiSEqCSupported()) |
274 | 277 | { |
275 | | |
| 278 | LOG(VB_CHANNEL, LOG_INFO, LOC + |
| 279 | QString("### calling diseqc_dev.FindTree(%1)").arg(m_inputid)); |
276 | 280 | diseqc_tree = diseqc_dev.FindTree(m_inputid); |
| 281 | LOG(VB_CHANNEL, LOG_INFO, LOC + |
| 282 | QString("### diseqc_tree = %1").arg((uint64_t)diseqc_tree, 0, 16)); |
277 | 283 | if (diseqc_tree) |
278 | 284 | { |
279 | 285 | bool is_SCR = false; |