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

gui/filebrowser.cpp: change checkBD() to static

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: f3e57a224d
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-09-27 (Sat, 27 Sep 2014)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
[CST] Focus
2014-09-27 15:16:44 +04:00
parent e6b68b929e
commit ba4934300d
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/gui/filebrowser.cpp
View File

@@ -747,7 +747,7 @@ bool CFileBrowser::readDir_std(const std::string & dirname, CFileList* flist)
bool CFileBrowser::checkBD(CFile &file) bool CFileBrowser::checkBD(CFile &file)
{ {
if (Hide_records && S_ISDIR(file.Mode)) { if (S_ISDIR(file.Mode)) {
std::string bdmv = file.Name + "/BDMV/index.bdmv"; std::string bdmv = file.Name + "/BDMV/index.bdmv";
if (access(bdmv.c_str(), F_OK) == 0) if (access(bdmv.c_str(), F_OK) == 0)
return true; return true;
@@ -1008,7 +1008,7 @@ bool CFileBrowser::exec(const char * const dirname)
std::string filename = filelist[selected].Name; std::string filename = filelist[selected].Name;
if ( filename.length() > 1 ) if ( filename.length() > 1 )
{ {
bool return_dir = checkBD(filelist[selected]); bool return_dir = Hide_records && checkBD(filelist[selected]);
if(!return_dir && (!Multi_Select) && S_ISDIR(filelist[selected].Mode) && !Dir_Mode) if(!return_dir && (!Multi_Select) && S_ISDIR(filelist[selected].Mode) && !Dir_Mode)
{ {
#ifdef ENABLE_INTERNETRADIO #ifdef ENABLE_INTERNETRADIO
@@ -1086,7 +1086,7 @@ bool CFileBrowser::exec(const char * const dirname)
for(unsigned int i = 0; i < filelist.size();i++) for(unsigned int i = 0; i < filelist.size();i++)
if(filelist[i].Marked) if(filelist[i].Marked)
{ {
bool return_dir = checkBD(filelist[i]); bool return_dir = Hide_records && checkBD(filelist[i]);
if(!return_dir && S_ISDIR(filelist[i].Mode)) { if(!return_dir && S_ISDIR(filelist[i].Mode)) {
if (!progress) { if (!progress) {
progress = new CProgressWindow(); progress = new CProgressWindow();

2
src/gui/filebrowser.h
View File

@@ -191,7 +191,6 @@ class CFileBrowser
void paintFoot(); void paintFoot();
void paintSMSKey(); void paintSMSKey();
void recursiveDelete(const char* file); void recursiveDelete(const char* file);
bool checkBD(CFile &file);
protected: protected:
void commonInit(); void commonInit();
@@ -238,6 +237,7 @@ class CFileBrowser
return Path; return Path;
} }
int getMenuRet() { return menu_ret; } int getMenuRet() { return menu_ret; }
static bool checkBD(CFile &file);
// size_t CurlWriteToString(void *ptr, size_t size, size_t nmemb, void *data); // size_t CurlWriteToString(void *ptr, size_t size, size_t nmemb, void *data);
private: private: