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

Revert "- infoviewer: allow to disable pip with RC_help if g_settings.show_ecm_pos is off (thx to mirz)"

Browse Source 
This reverts commit 84387b2878
because many testing code was commited by mistake


Origin commit data
------------------
Branch: ni/coolstream
Commit: ed28f6d569
Author: vanhofen <vanhofen@gmx.de>
Date: 2019-01-13 (Sun, 13 Jan 2019)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2019-01-13 20:45:57 +01:00
parent 84387b2878
commit 9d7fbb44ac
8 changed files with 27 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/gui/movieplayer.cpp
View File

@@ -596,7 +596,6 @@ void CMoviePlayerGui::Cleanup()
p_movie_info = NULL;
autoshot_done = false;
timeshift_deletion = false;
timeshift_to_record = false;
currentaudioname = "Unk";
}
@@ -2073,36 +2072,18 @@ void CMoviePlayerGui::PlayFileEnd(bool restore)
stopped = true;
printf("%s: stopped\n", __func__);
if (file_name.find("_temp.ts") == file_name.size() - 8)
if (timeshift_deletion && (file_name.find("_temp.ts") == file_name.size() - 8))
{
std::string ts_file = file_name;
std::string xml_file;
std::string file = file_name;
printf("%s: delete %s\n", __func__, file.c_str());
unlink(file.c_str());
CMovieInfo mi;
if (!mi.convertTs2XmlName(xml_file))
xml_file.clear();
if (timeshift_to_record)
if (mi.convertTs2XmlName(file))
{
printf("%s: move %s\n", __func__, ts_file.c_str());
//move here
if (!xml_file.empty())
{
printf("%s: move %s\n", __func__, xml_file.c_str());
//move here
}
timeshift_to_record = false;
}
else if (timeshift_deletion)
{
printf("%s: delete %s\n", __func__, ts_file.c_str());
unlink(ts_file.c_str());
if (!xml_file.empty())
{
printf("%s: delete %s\n", __func__, xml_file.c_str());
unlink(xml_file.c_str());
}
timeshift_deletion = false;
printf("%s: delete %s\n", __func__, file.c_str());
unlink(file.c_str());
}
timeshift_deletion = false;
}
if (!filelist.empty() && filelist_it != filelist.end()) {