mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-29 08:21:12 +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-06-15 12:32:31 +02:00
parent 6179aa7d38 78f1b294a9
commit 4c3002cb26
43 changed files with 473 additions and 295 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/gui/filebrowser.cpp
View File

@@ -43,6 +43,7 @@
#include <driver/screen_max.h>
#include <driver/display.h>
#include <driver/fontrenderer.h>
#include <system/debug.h>
#include <unistd.h>
#include <stdio.h>
@@ -556,19 +557,29 @@ bool CFileBrowser::readDir_std(const std::string & dirname, CFileList* flist)
struct stat64 statbuf;
dirent64 **namelist;
int n;
std::string to_scan_dir = dirname;
n = scandir64(dirname.c_str(), &namelist, 0, alphasort64);
n = scandir64(to_scan_dir.c_str(), &namelist, 0, alphasort64);
if (n < 0)
{
perror(("Filebrowser scandir: "+dirname).c_str());
std::string scn_err = "Filebrowser scandir: " + to_scan_dir + " ";
to_scan_dir = "/media/";
dprintf(DEBUG_NORMAL, "\033[33m[CFileBrowser]\[%s - %d], %s failed, %s, try fallback to [%s]\033[0m\n", __func__, __LINE__, scn_err.c_str(), strerror(errno), to_scan_dir.c_str());
n = scandir64(to_scan_dir.c_str(), &namelist, 0, alphasort64);
name = to_scan_dir;
}
if (n < 0){ //fallback failed
perror(("Filebrowser scandir: "+to_scan_dir).c_str());
return false;
}
for (int i = 0; i < n; i++)
{
CFile file;
if(strcmp(namelist[i]->d_name,".") != 0)
{
file.Name = dirname + namelist[i]->d_name;
file.Name = to_scan_dir + namelist[i]->d_name;
// printf("file.Name: '%s', getFileName: '%s' getPath: '%s'\n",file.Name.c_str(),file.getFileName().c_str(),file.getPath().c_str());
if(stat64((file.Name).c_str(),&statbuf) != 0)
@@ -1473,8 +1484,9 @@ void CFileBrowser::paint()
paintItem(count);
//scrollbar
int total_pages = filelist.size() == 0 ? 1 : ((filelist.size() - 1) / listmaxshow) + 1;
int current_page = (selected / listmaxshow);
int total_pages;
int current_page;
getScrollBarData(&total_pages, &current_page, filelist.size(), listmaxshow, selected);
paintScrollBar(x + width - SCROLLBAR_WIDTH, y + header_height, SCROLLBAR_WIDTH, item_height*listmaxshow, total_pages, current_page);
}