1 | diff --git a/mythtv/libs/libmythdb/mythcorecontext.cpp b/mythtv/libs/libmythdb/mythcorecontext.cpp |
---|
2 | --- a/mythtv/libs/libmythdb/mythcorecontext.cpp |
---|
3 | +++ b/mythtv/libs/libmythdb/mythcorecontext.cpp |
---|
4 | @@ -890,7 +890,11 @@ void MythCoreContext::readyRead(MythSock |
---|
5 | { |
---|
6 | strlist.pop_front(); |
---|
7 | strlist.pop_front(); |
---|
8 | + |
---|
9 | MythEvent me(message, strlist); |
---|
10 | + |
---|
11 | + VERBOSE(VB_NETWORK, QString("MythCoreContext::readyRead(): dispatching MythEvent: %1").arg(me.Message())); |
---|
12 | + |
---|
13 | dispatch(me); |
---|
14 | } |
---|
15 | } |
---|
16 | @@ -1093,14 +1097,14 @@ MythPrivRequest MythCoreContext::popPriv |
---|
17 | |
---|
18 | void MythCoreContext::dispatch(const MythEvent &event) |
---|
19 | { |
---|
20 | - VERBOSE(VB_NETWORK, QString("MythEvent: %1").arg(event.Message())); |
---|
21 | + VERBOSE(VB_NETWORK, QString("MythCoreContext::dispatch(): MythEvent: %1").arg(event.Message())); |
---|
22 | |
---|
23 | MythObservable::dispatch(event); |
---|
24 | } |
---|
25 | |
---|
26 | void MythCoreContext::dispatchNow(const MythEvent &event) |
---|
27 | { |
---|
28 | - VERBOSE(VB_NETWORK, QString("MythEvent: %1").arg(event.Message())); |
---|
29 | + VERBOSE(VB_NETWORK, QString("MythCoreContext::dispatchNow(): MythEvent: %1").arg(event.Message())); |
---|
30 | |
---|
31 | MythObservable::dispatchNow(event); |
---|
32 | } |
---|
33 | diff --git a/mythtv/libs/libmythtv/signalmonitor.cpp b/mythtv/libs/libmythtv/signalmonitor.cpp |
---|
34 | --- a/mythtv/libs/libmythtv/signalmonitor.cpp |
---|
35 | +++ b/mythtv/libs/libmythtv/signalmonitor.cpp |
---|
36 | @@ -177,6 +177,8 @@ SignalMonitor::SignalMonitor(int _captur |
---|
37 | channelTuned("Channel Tuned", "tuned", 3, true, 0, 3, 0), |
---|
38 | statusLock(QMutex::Recursive) |
---|
39 | { |
---|
40 | + VERBOSE(VB_CHANNEL, |
---|
41 | + QString("Creating SignalMonitor %1").arg((size_t)this, 0, 16)); |
---|
42 | } |
---|
43 | |
---|
44 | /** \fn SignalMonitor::~SignalMonitor() |
---|
45 | @@ -185,6 +187,9 @@ SignalMonitor::SignalMonitor(int _captur |
---|
46 | SignalMonitor::~SignalMonitor() |
---|
47 | { |
---|
48 | Stop(); |
---|
49 | + |
---|
50 | + VERBOSE(VB_CHANNEL, |
---|
51 | + QString("SignalMonitor %1 destroyed").arg((size_t)this, 0, 16)); |
---|
52 | } |
---|
53 | |
---|
54 | void SignalMonitor::AddFlags(uint64_t _flags) |
---|
55 | @@ -252,6 +257,8 @@ void SignalMonitor::Stop() |
---|
56 | DBG_SM("Stop", "begin"); |
---|
57 | { |
---|
58 | QMutexLocker locker(&startStopLock); |
---|
59 | + VERBOSE(VB_CHANNEL, |
---|
60 | + QString("SignalMonitor::Stop, running %1").arg(running)); |
---|
61 | if (running) |
---|
62 | { |
---|
63 | exit = true; |
---|
64 | @@ -314,17 +321,25 @@ void SignalMonitor::MonitorLoop() |
---|
65 | { |
---|
66 | //signal(SIGALRM, ALRMhandler); |
---|
67 | |
---|
68 | + VERBOSE(VB_CHANNEL, |
---|
69 | + QString("SignalMonitor::MonitorLoop() starting (%1)").arg((size_t)this, 0, 16)); |
---|
70 | + |
---|
71 | running = true; |
---|
72 | exit = false; |
---|
73 | |
---|
74 | + uint32_t serial = 0; |
---|
75 | + |
---|
76 | while (!exit) |
---|
77 | { |
---|
78 | UpdateValues(); |
---|
79 | |
---|
80 | if (notify_frontend && capturecardnum>=0) |
---|
81 | { |
---|
82 | + VERBOSE(VB_CHANNEL, |
---|
83 | + QString("SignalMonitor::MonitorLoop(), sending MythEvent")); |
---|
84 | + |
---|
85 | QStringList slist = GetStatusList(false); |
---|
86 | - MythEvent me(QString("SIGNAL %1").arg(capturecardnum), slist); |
---|
87 | + MythEvent me(QString("SIGNAL %1 foo %2:%3").arg(capturecardnum).arg((size_t)this, 0,16).arg(serial++), slist); |
---|
88 | gCoreContext->dispatch(me); |
---|
89 | //cerr<<"sent SIGNAL"<<endl; |
---|
90 | } |
---|
91 | @@ -338,13 +353,16 @@ void SignalMonitor::MonitorLoop() |
---|
92 | if (notify_frontend && capturecardnum>=0) |
---|
93 | { |
---|
94 | QStringList slist = GetStatusList(false); |
---|
95 | - MythEvent me(QString("SIGNAL %1").arg(capturecardnum), slist); |
---|
96 | + MythEvent me(QString("SIGNAL %1 bar %2:%3").arg(capturecardnum).arg((size_t)this, 0,16).arg(serial++), slist); |
---|
97 | gCoreContext->dispatch(me); |
---|
98 | } |
---|
99 | |
---|
100 | //signal(SIGALRM, SIG_DFL); |
---|
101 | |
---|
102 | running = false; |
---|
103 | + |
---|
104 | + VERBOSE(VB_CHANNEL, |
---|
105 | + QString("SignalMonitor::MonitorLoop() done (%1)").arg((size_t)this, 0, 16)); |
---|
106 | } |
---|
107 | |
---|
108 | /** \fn SignalMonitor::SpawnMonitorLoop(void*) |
---|
109 | diff --git a/mythtv/libs/libmythtv/tv_rec.cpp b/mythtv/libs/libmythtv/tv_rec.cpp |
---|
110 | --- a/mythtv/libs/libmythtv/tv_rec.cpp |
---|
111 | +++ b/mythtv/libs/libmythtv/tv_rec.cpp |
---|
112 | @@ -3759,6 +3759,8 @@ void TVRec::TuningFrequency(const Tuning |
---|
113 | |
---|
114 | if (request.IsOnSameMultiplex()) |
---|
115 | { |
---|
116 | + VERBOSE(VB_CHANNEL, |
---|
117 | + QString("MythEvent from IsOnSameMultiplex")); |
---|
118 | QStringList slist; |
---|
119 | slist<<"message"<<QObject::tr("On known multiplex..."); |
---|
120 | MythEvent me(QString("SIGNAL %1").arg(cardid), slist); |
---|