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

Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox

Browse Source 
Conflicts:
	configure.ac
	data/fonts/Makefile.am
	src/gui/cam_menu.cpp
	src/gui/update.cpp
	src/zapit/src/capmt.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 5db35f49c0
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-12 (Sun, 12 Feb 2017)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-02-12 21:54:48 +01:00
parent a99fe21b74 ed047027d1
commit 4ac4e963ad
41 changed files with 206 additions and 176 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/gui/update.h
View File

@@ -38,7 +38,8 @@
#include <gui/widget/progresswindow.h>
#ifdef BOXMODEL_APOLLO
#include <driver/framebuffer.h>
#ifdef BOXMODEL_CS_HD2
#include <system/mtdutils/mkfs.jffs2.h>
#endif
@@ -81,13 +82,13 @@ class CFlashExpert : public CProgressWindow
int showFileSelector(const std::string & actionkey);
bool checkSize(int mtd, std::string &backupFile);
#ifdef BOXMODEL_APOLLO
#ifdef BOXMODEL_CS_HD2
bool readDevtableFile(std::string &devtableFile, CMkfsJFFS2::v_devtable_t &v_devtable);
void readmtdJFFS2(std::string &filename, std::string title="", std::string path="/", bool makeDevTable=true);
#endif
public:
#ifdef BOXMODEL_APOLLO
#ifdef BOXMODEL_CS_HD2
bool forceOtherFilename;
std::string otherFilename;
int createimage_other;
@@ -100,7 +101,7 @@ class CFlashExpert : public CProgressWindow
};
#ifdef BOXMODEL_APOLLO
#ifdef BOXMODEL_CS_HD2
class CFlashExpertSetup : public CMenuTarget
{
private:
@@ -115,6 +116,6 @@ class CFlashExpertSetup : public CMenuTarget
int exec(CMenuTarget* parent, const std::string &actionKey);
};
#endif // BOXMODEL_APOLLO
#endif // BOXMODEL_CS_HD2
#endif