mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-30 17:01:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into pu/mp

Browse Source
This commit is contained in:
Jacek Jendrzej
2017-08-23 13:10:49 +02:00
parent 8c45b2eea6 350a73ce08
commit 6be63f736c
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

@@ -1504,7 +1504,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))
@@ -2331,7 +2330,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())
@@ -2484,7 +2483,6 @@ bool CMoviePlayerGui::convertSubtitle(std::string &text)
else {
memset(buf + (len - olen), 0, olen);
text = buf;
ret = true;
}
free(buf);