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 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox

Browse Source 
Conflicts:
	src/neutrino.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 470a8b62dd
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-08-23 (Wed, 23 Aug 2017)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-08-23 15:24:38 +02:00
parent 90a51a4564 6b015862c1
commit 79c24b3173
15 changed files with 40 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/gui/movieplayer.cpp
View File

@@ -1520,7 +1520,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))
@@ -2369,7 +2368,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())
@@ -2522,7 +2521,6 @@ bool CMoviePlayerGui::convertSubtitle(std::string &text)
else {
memset(buf + (len - olen), 0, olen);
text = buf;
ret = true;
}
free(buf);