mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-09-03 10:51:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'uncool/dvbsi++' commit 3bbaddec39

Browse Source 
Conflicts:
	src/driver/framebuffer.cpp
This commit is contained in:
Stefan Seyfried
2013-01-03 09:46:11 +01:00
parent 09e0efb01e 3bbaddec39
commit 8d69036be5
14 changed files with 123 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/system/helpers.cpp
View File

@@ -193,7 +193,7 @@ int check_dir(const char * dir)
return ret;
}
bool get_fs_usage(const char * dir, long &btotal, long &bused)
bool get_fs_usage(const char * dir, long &btotal, long &bused, long *bsize/*=NULL*/)
{
btotal = bused = 0;
struct statfs s;
@@ -201,6 +201,8 @@ bool get_fs_usage(const char * dir, long &btotal, long &bused)
if (::statfs(dir, &s) == 0 && s.f_blocks) {
btotal = s.f_blocks;
bused = s.f_blocks - s.f_bfree;
if (bsize != NULL)
*bsize = s.f_bsize;
//printf("fs (%s): total %ld used %ld\n", dir, btotal, bused);
return true;
}

2
src/system/helpers.h
View File

@@ -31,7 +31,7 @@ int safe_mkdir(char * path);
bool file_exists(const char *filename);
void wakeup_hdd(const char *hdd_dir);
int check_dir(const char * dir);
bool get_fs_usage(const char * dir, long &total, long &used);
bool get_fs_usage(const char * dir, long &total, long &used, long *bsize=NULL);
bool get_mem_usage(unsigned long &total, unsigned long &free);
std::string trim(std::string &str, const std::string &trimChars = " \n\r\t");

2
src/system/locals.h
View File

@@ -514,9 +514,11 @@ typedef enum
LOCALE_FLASHUPDATE_TITLEREADFLASH,
LOCALE_FLASHUPDATE_TITLEWRITEFLASH,
LOCALE_FLASHUPDATE_UPDATE_WITH_SETTINGS_DEL_SKIPPED,
LOCALE_FLASHUPDATE_UPDATE_WITH_SETTINGS_ERROR,
LOCALE_FLASHUPDATE_UPDATE_WITH_SETTINGS_PROCESSED,
LOCALE_FLASHUPDATE_UPDATE_WITH_SETTINGS_SKIPPED,
LOCALE_FLASHUPDATE_UPDATE_WITH_SETTINGS_SUCCESSFULLY,
LOCALE_FLASHUPDATE_UPDATE_WITH_SETTINGS_WARNING,
LOCALE_FLASHUPDATE_UPDATEMODE,
LOCALE_FLASHUPDATE_UPDATEMODE_INTERNET,
LOCALE_FLASHUPDATE_UPDATEMODE_MANUAL,

2
src/system/locals_intern.h
View File

@@ -514,9 +514,11 @@ const char * locale_real_names[] =
"flashupdate.titlereadflash",
"flashupdate.titlewriteflash",
"flashupdate.update_with_settings_del_skipped",
"flashupdate.update_with_settings_error",
"flashupdate.update_with_settings_processed",
"flashupdate.update_with_settings_skipped",
"flashupdate.update_with_settings_successfully",
"flashupdate.update_with_settings_warning",
"flashupdate.updatemode",
"flashupdate.updatemode_internet",
"flashupdate.updatemode_manual",