mirror of
https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git
synced 2025-09-09 14:48:28 +02:00
neutrino moviebrowser: fix movie scan in settings menu with blue button
This should fix some problems with rendered backgrounds while
menu operations.
Patch by Gaucho316
see also: http://www.dbox2-tuning.net/forum/viewtopic.php?p=380340#p380340
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1705 e54a6e83-5905-42d5-8d5c-058d10e6a962
Origin commit data
------------------
Commit: f6dd8b97af
Author: Thilo Graf <dbt@novatux.de>
Date: 2011-09-20 (Tue, 20 Sep 2011)
Origin message was:
------------------
*neutrino moviebrowser: fix movie scan in settings menu with blue button
This should fix some problems with rendered backgrounds while
menu operations.
Patch by Gaucho316
see also: http://www.dbox2-tuning.net/forum/viewtopic.php?p=380340#p380340
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1705 e54a6e83-5905-42d5-8d5c-058d10e6a962
This commit is contained in:
@@ -874,8 +874,8 @@ int CMovieBrowser::exec(CMenuTarget* parent, const std::string & actionKey)
|
|||||||
}
|
}
|
||||||
else if(actionKey == "reload_movie_info")
|
else if(actionKey == "reload_movie_info")
|
||||||
{
|
{
|
||||||
loadMovies();
|
loadMovies(false);
|
||||||
refresh();
|
updateMovieSelection();
|
||||||
}
|
}
|
||||||
else if(actionKey == "run")
|
else if(actionKey == "run")
|
||||||
{
|
{
|
||||||
@@ -2710,7 +2710,7 @@ bool CMovieBrowser::addDir(std::string& dirname, int* used)
|
|||||||
return (true);
|
return (true);
|
||||||
}
|
}
|
||||||
|
|
||||||
void CMovieBrowser::loadMovies(void)
|
void CMovieBrowser::loadMovies(bool doRefresh)
|
||||||
{
|
{
|
||||||
time_t time_start = time(NULL);
|
time_t time_start = time(NULL);
|
||||||
clock_t clock_start = clock()/10000; // CLOCKS_PER_SECOND
|
clock_t clock_start = clock()/10000; // CLOCKS_PER_SECOND
|
||||||
@@ -2738,15 +2738,19 @@ void CMovieBrowser::loadMovies(void)
|
|||||||
|
|
||||||
loadBox.hide();
|
loadBox.hide();
|
||||||
|
|
||||||
//clock_act = clock()/10000;TRACE("[mb] *5: time %9ld clock %6ld dclock %6ld*\n",(long)time(NULL),clock_act,clock_act - clock_prev);clock_prev = clock_act;
|
if (doRefresh)
|
||||||
refreshBrowserList();
|
{
|
||||||
//clock_act = clock()/10000;TRACE("[mb] *6: time %9ld clock %6ld dclock %6ld*\n",(long)time(NULL),clock_act,clock_act - clock_prev);clock_prev = clock_act;
|
//clock_act = clock()/10000;TRACE("[mb] *5: time %9ld clock %6ld dclock %6ld*\n",(long)time(NULL),clock_act,clock_act - clock_prev);clock_prev = clock_act;
|
||||||
refreshLastPlayList();
|
refreshBrowserList();
|
||||||
refreshLastRecordList();
|
//clock_act = clock()/10000;TRACE("[mb] *6: time %9ld clock %6ld dclock %6ld*\n",(long)time(NULL),clock_act,clock_act - clock_prev);clock_prev = clock_act;
|
||||||
refreshFilterList();
|
refreshLastPlayList();
|
||||||
refreshMovieInfo(); // is done by refreshBrowserList if needed
|
refreshLastRecordList();
|
||||||
//clock_act = clock()/10000;TRACE("[mb] *7: time %9ld clock %6ld dclock %6ld*\n",(long)time(NULL),clock_act,clock_act - clock_prev);clock_prev = clock_act;
|
refreshFilterList();
|
||||||
TRACE("[mb] ***Total:time %ld clock %ld***\n",(time(NULL)-time_start), clock_act-clock_start);
|
refreshMovieInfo(); // is done by refreshBrowserList if needed
|
||||||
|
//clock_act = clock()/10000;TRACE("[mb] *7: time %9ld clock %6ld dclock %6ld*\n",(long)time(NULL),clock_act,clock_act - clock_prev);clock_prev = clock_act;
|
||||||
|
}
|
||||||
|
|
||||||
|
TRACE("[mb] ***Total:time %ld clock %ld***\n",(time(NULL)-time_start), clock_act-clock_start);
|
||||||
}
|
}
|
||||||
|
|
||||||
void CMovieBrowser::loadAllMovieInfo(void)
|
void CMovieBrowser::loadAllMovieInfo(void)
|
||||||
@@ -3038,6 +3042,7 @@ bool CMovieBrowser::showMenu(MI_MOVIE_INFO* /*movie_info*/)
|
|||||||
refreshLastPlayList();
|
refreshLastPlayList();
|
||||||
refreshLastRecordList();
|
refreshLastRecordList();
|
||||||
refreshFilterList();
|
refreshFilterList();
|
||||||
|
refreshMovieInfo();
|
||||||
refresh();
|
refresh();
|
||||||
|
|
||||||
for(i=0; i<MB_MAX_DIRS ;i++)
|
for(i=0; i<MB_MAX_DIRS ;i++)
|
||||||
|
@@ -381,7 +381,7 @@ class CMovieBrowser : public CMenuTarget
|
|||||||
void defaultSettings(MB_SETTINGS* settings);
|
void defaultSettings(MB_SETTINGS* settings);
|
||||||
|
|
||||||
///// EPG_DATA /XML ///////////////////////////////
|
///// EPG_DATA /XML ///////////////////////////////
|
||||||
void loadMovies();
|
void loadMovies(bool doRefresh = true);
|
||||||
void loadAllMovieInfo(void); // P1
|
void loadAllMovieInfo(void); // P1
|
||||||
void saveMovieInfo(std::string* filename, MI_MOVIE_INFO* movie_info); // P2
|
void saveMovieInfo(std::string* filename, MI_MOVIE_INFO* movie_info); // P2
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user