mirror of
https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git
synced 2025-08-29 16:31:05 +02:00
Merge remote-tracking branch 'tuxbox/master'
Origin commit data
------------------
Branch: ni/coolstream
Commit: 1d9d81d448
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-15 (Wed, 15 Feb 2017)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
This commit is contained in:
@@ -323,6 +323,7 @@ bool cYTFeedParser::parseFeedJSON(std::string &answer)
|
||||
Json::Value elements = root["items"];
|
||||
for(unsigned int i=0; i<elements.size();++i)
|
||||
{
|
||||
OnLoadVideoInfo(i, elements.size(), g_Locale->getText(LOCALE_MOVIEBROWSER_SCAN_FOR_MOVIES));
|
||||
#ifdef DEBUG_PARSER
|
||||
printf("=========================================================\n");
|
||||
printf("Element %d in elements\n", i);
|
||||
|
@@ -27,7 +27,7 @@
|
||||
#include <string>
|
||||
#include <map>
|
||||
#include <xmltree/xmlinterface.h>
|
||||
|
||||
#include <sigc++/sigc++.h>
|
||||
#include <OpenThreads/Thread>
|
||||
#include <OpenThreads/Condition>
|
||||
|
||||
@@ -155,6 +155,8 @@ class cYTFeedParser
|
||||
void SetMaxResults(int count) { max_results = count; }
|
||||
void SetConcurrentDownloads(int count) { concurrent_downloads = count; }
|
||||
void SetThumbnailDir(std::string &_thumbnail_dir);
|
||||
|
||||
sigc::signal<void, size_t, size_t, std::string> OnLoadVideoInfo;
|
||||
};
|
||||
|
||||
#endif
|
||||
|
Reference in New Issue
Block a user