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/neutrino.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 3c35e98212
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-08-25 (Fri, 25 Aug 2017)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-08-25 14:15:22 +02:00
parent a4ebf460c1 84b01945fb
commit 4198cb9a35
40 changed files with 225 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/gui/movieplayer.cpp
View File

@@ -1552,7 +1552,6 @@ void CMoviePlayerGui::PlayFileLoop(void)
disableOsdElements(MUTE);
CFileBrowser *playlist = new CFileBrowser();
CFile *pfile = NULL;
pfile = &(*filelist_it);
int selected = std::distance( filelist.begin(), filelist_it );
filelist_it = filelist.end();
if (playlist->playlist_manager(filelist, selected))
@@ -2402,7 +2401,7 @@ void CMoviePlayerGui::selectChapter()
playback->GetChapters(positions, titles);
std::vector<int> playlists; std::vector<std::string> ptitles;
int current;
int current = 0;
playback->GetTitles(playlists, ptitles, current);
if (positions.empty() && playlists.empty())
@@ -2555,7 +2554,6 @@ bool CMoviePlayerGui::convertSubtitle(std::string &text)
else {
memset(buf + (len - olen), 0, olen);
text = buf;
ret = true;
}
free(buf);