Skip to content

Commit f26aa0d

Browse files
committed
disabled: mark 404, because of an unclear deadlock
1 parent 6e861be commit f26aa0d

File tree

3 files changed

+18
-11
lines changed

3 files changed

+18
-11
lines changed

Diff for: HISTORY

+2-1
Original file line numberDiff line numberDiff line change
@@ -320,4 +320,5 @@ VDR Plugin 'iptv' Revision History
320320
- improved error handling
321321
- show errors as VDR message
322322
- copied RadioImage from Radio plugin (will be only activated if radio plugin is not found)
323-
- mark channels which cannot be reached with '- 404'
323+
- (currently disabled, because of an unknown deadlock)
324+
mark channels which cannot be reached with '- 404'

Diff for: common.cpp

+14-8
Original file line numberDiff line numberDiff line change
@@ -117,28 +117,34 @@ void printBacktrace() {
117117
}
118118

119119
void mark404Channel(int channelId) {
120+
/*
120121
std::lock_guard<std::mutex> guard(all404ChannelMutex);
121122
all404Channels.emplace(channelId);
123+
*/
122124
}
123125

124126
void rename404Channels() {
127+
/*
125128
if (all404Channels.empty()) {
126129
return;
127130
}
128131
129132
std::lock_guard<std::mutex> guard(all404ChannelMutex);
130-
LOCK_CHANNELS_WRITE;
131133
132134
for (auto c : all404Channels) {
133-
cChannel *channel = Channels->GetByNumber(c);
134-
135-
if (channel) {
136-
if (!endswith(channel->Name(), CHANNELMARK404)) {
137-
channel->SetName(cString::sprintf("%s %s", channel->Name(), CHANNELMARK404),
138-
channel->ShortName(),
139-
cString::sprintf("%s %s", CHANNELMARK404, channel->Provider()));
135+
{
136+
LOCK_CHANNELS_WRITE;
137+
cChannel *channel = Channels->GetByNumber(c);
138+
139+
if (channel) {
140+
if (!endswith(channel->Name(), CHANNELMARK404)) {
141+
channel->SetName(cString::sprintf("%s %s", channel->Name(), CHANNELMARK404),
142+
channel->ShortName(),
143+
cString::sprintf("%s %s", CHANNELMARK404, channel->Provider()));
144+
}
140145
}
141146
}
142147
}
148+
*/
143149
}
144150

Diff for: iptv.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -133,8 +133,8 @@ bool cPluginIptv::Start() {
133133
info("%s", *info);
134134
}
135135

136-
thread404Running = true;
137-
thread404 = std::thread(run404);
136+
// thread404Running = true;
137+
// thread404 = std::thread(run404);
138138

139139
return true;
140140
}

0 commit comments

Comments
 (0)