Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Remove grabber specific behaviour for tv_grab_jp

When I actually looked at it, it wasn't doing anything that
couldn't or shouldn't be done anyway. This was the last bit of code
that was specificially keyed for a particular xmltv grabber.
  • Loading branch information...
commit ffdb68265fb0bb8e3035dcdadda249f2e428ce7a 1 parent 0b21289
@stuartm stuartm authored
View
10 mythtv/programs/mythfilldatabase/filldata.cpp
@@ -394,14 +394,8 @@ bool FillData::GrabData(Source source, int offset, QDate *qCurrentDate)
QString command = QString("nice %1 --config-file '%2' --output %3")
.arg(xmltv_grabber).arg(configfile).arg(filename);
- // The one concession to grabber specific behaviour.
- // Will be removed when the grabber allows.
- if (xmltv_grabber == "tv_grab_jp")
- {
- command += QString(" --enable-readstr");
- xmltv_parser.isJapan = true;
- }
- else if (source.xmltvgrabber_prefmethod != "allatonce")
+
+ if (source.xmltvgrabber_prefmethod != "allatonce")
{
// XMLTV Docs don't recommend grabbing one day at a
// time but the current MythTV code is heavily geared
View
19 mythtv/programs/mythfilldatabase/xmltvparser.cpp
@@ -26,7 +26,7 @@
#include "channeldata.h"
#include "fillutil.h"
-XMLTVParser::XMLTVParser() : isJapan(false), current_year(0)
+XMLTVParser::XMLTVParser() : current_year(0)
{
current_year = MythDate::current().date().toString("yyyy").toUInt();
}
@@ -100,7 +100,7 @@ ChannelInfo *XMLTVParser::parseChannel(QDomElement &element, QUrl &baseUrl)
{
chaninfo->name = info.text();
}
- else if (isJapan && chaninfo->callsign.isEmpty())
+ else if (chaninfo->callsign.isEmpty())
{
chaninfo->callsign = info.text();
}
@@ -303,16 +303,13 @@ ProgInfo *XMLTVParser::parseProgram(QDomElement &element)
{
if (info.tagName() == "title")
{
- if (isJapan)
+ if (info.attribute("lang") == "ja_JP")
{
- if (info.attribute("lang") == "ja_JP")
- {
- pginfo->title = getFirstText(info);
- }
- else if (info.attribute("lang") == "ja_JP@kana")
- {
- pginfo->title_pronounce = getFirstText(info);
- }
+ pginfo->title = getFirstText(info);
+ }
+ else if (info.attribute("lang") == "ja_JP@kana")
+ {
+ pginfo->title_pronounce = getFirstText(info);
}
else if (pginfo->title.isEmpty())
{
View
3  mythtv/programs/mythfilldatabase/xmltvparser.h
@@ -23,9 +23,6 @@ class XMLTVParser
bool parseFile(QString filename, ChannelInfoList *chanlist,
QMap<QString, QList<ProgInfo> > *proglist);
- public:
- bool isJapan;
-
private:
unsigned int current_year;
};
Please sign in to comment.
Something went wrong with that request. Please try again.