Skip to content
Permalink
Browse files

Revert "Merge pull request #15734 from ronie/python-thumb-preview"

This reverts commit 8235ef2, reversing
changes made to e75bb17.
  • Loading branch information...
popcornmix committed May 7, 2019
1 parent 1070ae1 commit 263a9d611f91dc69214b564929ef5d55dd5a4c26
@@ -701,8 +701,7 @@ static void ParseThumbs(CScraperUrl &scurl,
prefix << tag << i + 1;
std::string url = FromString(item, prefix.str() + ".url");
std::string aspect = FromString(item, prefix.str() + ".aspect");
std::string preview = FromString(item, prefix.str() + ".preview");
scurl.AddElement(url, aspect, preview);
scurl.AddElement(url, aspect);
}
}

@@ -743,10 +743,10 @@ namespace XBMCAddon
GetVideoInfoTag()->m_fanart.Pack();
}

void ListItem::addAvailableArtwork(std::string url, std::string art_type, std::string preview, std::string referrer, std::string cache, bool post, bool isgz, int season)
void ListItem::addAvailableArtwork(std::string url, std::string art_type, std::string referrer, std::string cache, bool post, bool isgz, int season)
{
XBMCAddonUtils::GuiLock lock(languageHook, m_offscreen);
GetVideoInfoTag()->m_strPictureURL.AddElement(url, art_type, preview, referrer, cache, post, isgz, season);
GetVideoInfoTag()->m_strPictureURL.AddElement(url, art_type, referrer, cache, post, isgz, season);
}

void ListItem::addStreamInfo(const char* cType, const Properties& dictionary)
@@ -798,7 +798,6 @@ namespace XBMCAddon
///
/// @param url string (image path url)
/// @param art_type string (image type)
/// @param preview [opt] string (image preview path url)
/// @param referrer [opt] string (referrer url)
/// @param cache [opt] string (filename in cache)
/// @param post [opt] bool (use post to retrieve the image, default false)
@@ -808,7 +807,6 @@ namespace XBMCAddon
///
///-----------------------------------------------------------------------
/// @python_v18 New function added.
/// @python_v19 New param added (preview).
///
/// **Example:**
/// ~~~~~~~~~~~~~{.py}
@@ -819,7 +817,7 @@ namespace XBMCAddon
///
addAvailableArtwork(...);
#else
void addAvailableArtwork(std::string url, std::string art_type = "", std::string preview = "", std::string referrer = "", std::string cache = "", bool post = false, bool isgz = false, int season = -1);
void addAvailableArtwork(std::string url, std::string art_type = "", std::string referrer = "", std::string cache = "", bool post = false, bool isgz = false, int season = -1);
#endif

#ifdef DOXYGEN_SHOULD_USE_THIS
@@ -325,7 +325,7 @@ bool CScraperUrl::ParseEpisodeGuide(std::string strUrls)
return true;
}

void CScraperUrl::AddElement(std::string url, std::string aspect, std::string preview, std::string referrer, std::string cache, bool post, bool isgz, int season)
void CScraperUrl::AddElement(std::string url, std::string aspect, std::string referrer, std::string cache, bool post, bool isgz, int season)
{
TiXmlElement thumb("thumb");
thumb.SetAttribute("spoof", referrer);
@@ -340,7 +340,6 @@ void CScraperUrl::AddElement(std::string url, std::string aspect, std::string pr
thumb.SetAttribute("type", "season");
}
thumb.SetAttribute("aspect", aspect);
thumb.SetAttribute("preview", preview);
TiXmlText text(url);
thumb.InsertEndChild(text);
m_xml << thumb;
@@ -45,7 +45,7 @@ class CScraperUrl
bool ParseString(std::string); // copies by intention
bool ParseElement(const TiXmlElement*);
bool ParseEpisodeGuide(std::string strUrls); // copies by intention
void AddElement(std::string url, std::string aspect = "", std::string preview = "", std::string referrer = "", std::string cache = "", bool post = false, bool isgz = false, int season = -1);
void AddElement(std::string url, std::string aspect = "", std::string referrer = "", std::string cache = "", bool post = false, bool isgz = false, int season = -1);

const SUrlEntry GetFirstThumb(const std::string &type = "") const;
const SUrlEntry GetSeasonThumb(int season, const std::string &type = "") const;

0 comments on commit 263a9d6

Please sign in to comment.
You can’t perform that action at this time.