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

movieplayer: use #defines from record.h for timeshift

Browse Source 
Conflicts:
	src/gui/movieplayer.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 540a060ba9
Author: martii <m4rtii@gmx.de>
Date: 2014-04-17 (Thu, 17 Apr 2014)



------------------
This commit was generated by Migit
This commit is contained in:
martii
2014-04-17 16:23:36 +02:00
committed by [CST] Focus
parent 5f118b65da
commit c3a494579d
5 changed files with 59 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/gui/moviebrowser.cpp
View File

@@ -2313,7 +2313,7 @@ void CMovieBrowser::onDeleteFile(MI_MOVIE_INFO& movieSelectionHandler, bool skip
unlink(fname.c_str());
CFile file_xml = movieSelectionHandler.file;
if(m_movieInfo.convertTs2XmlName(&file_xml.Name) == true)
if(m_movieInfo.convertTs2XmlName(file_xml.Name))
{
//delFile(file_xml);
unlink(file_xml.Name.c_str());
@@ -3452,7 +3452,6 @@ bool CMovieBrowser::getMovieInfoItem(MI_MOVIE_INFO& movie_info, MB_INFO_ITEM ite
*item_string="";
tm* tm_tmp;
char text[20];
int i=0;
int counter=0;
@@ -3503,9 +3502,7 @@ bool CMovieBrowser::getMovieInfoItem(MI_MOVIE_INFO& movie_info, MB_INFO_ITEM ite
if(movie_info.bookmarks.user[i].pos != 0)
counter++;
}
snprintf(text, 8,"%d",counter);
text[9] = 0; // just to make sure string is terminated
*item_string = text;
*item_string = to_string(counter);;
break;
case MB_INFO_QUALITY: // = 11,
snprintf(str_tmp,MAX_STR_TMP,"%d",movie_info.quality);