mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-02 18:31:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ni/tuxbox' into ni/mp/tuxbox

Browse Source 
Conflicts:
	src/gui/hdd_menu.cpp
	src/gui/hdd_menu.h


Origin commit data
------------------
Branch: ni/coolstream
Commit: 73418490bc
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-02 (Mon, 02 Oct 2017)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-10-02 23:21:37 +02:00
parent 6458ea748a 463700033b
commit 0a0c8a13bf
39 changed files with 69 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/gui/movieplayer.cpp
View File

@@ -864,7 +864,7 @@ bool CMoviePlayerGui::luaGetUrl(const std::string &script, const std::string &fi
return false;
}
string errMsg = "";
std::string errMsg = "";
Json::Value root;
bool ok = parseJsonFromString(result_string, &root, &errMsg);
if (!ok) {
@@ -2690,7 +2690,7 @@ void CMoviePlayerGui::showSubtitle(neutrino_msg_data_t data)
size_t start = 0, end = 0;
/* split string with \N as newline */
std::string delim("\\N");
while ((end = str.find(delim, start)) != string::npos) {
while ((end = str.find(delim, start)) != std::string::npos) {
subtext.push_back(str.substr(start, end - start));
start = end + 2;
}