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

Merge remote-tracking branch 'check/cst-next'

Browse Source 
needs build- and functional fixes

Conflicts:
	configure.ac
	data/icons/shutdown.jpg
	data/icons/start.jpg
	data/locale/deutsch.locale
	data/locale/english.locale
	lib/libmd5sum/md5.c
	src/driver/scanepg.cpp
	src/driver/streamts.cpp
	src/driver/vfd.cpp
	src/driver/vfd.h
	src/driver/volume.cpp
	src/eitd/dmx.cpp
	src/eitd/xmlutil.cpp
	src/gui/Makefile.am
	src/gui/audiomute.cpp
	src/gui/channellist.cpp
	src/gui/dboxinfo.cpp
	src/gui/epgview.cpp
	src/gui/eventlist.cpp
	src/gui/filebrowser.cpp
	src/gui/hdd_menu.cpp
	src/gui/infoviewer.cpp
	src/gui/infoviewer_bb.cpp
	src/gui/infoviewer_bb.h
	src/gui/keybind_setup.cpp
	src/gui/luainstance.cpp
	src/gui/luainstance.h
	src/gui/miscsettings_menu.cpp
	src/gui/moviebrowser.cpp
	src/gui/movieplayer.cpp
	src/gui/osd_progressbar_setup.cpp
	src/gui/osd_progressbar_setup.h
	src/gui/osd_setup.cpp
	src/gui/osdlang_setup.cpp
	src/gui/personalize.cpp
	src/gui/plugins.cpp
	src/gui/plugins.h
	src/gui/scan.cpp
	src/gui/scan_setup.cpp
	src/gui/update_settings.cpp
	src/gui/user_menue.cpp
	src/gui/user_menue_setup.cpp
	src/gui/videosettings.cpp
	src/gui/widget/buttons.cpp
	src/gui/widget/menue.cpp
	src/gui/widget/menue.h
	src/gui/widget/progresswindow.cpp
	src/neutrino.cpp
	src/neutrino_menue.cpp
	src/nhttpd/yhttpd.cpp
	src/system/helpers.cpp
	src/system/locals.h
	src/system/locals_intern.h
	src/system/setting_helpers.cpp
	src/zapit/lib/zapitclient.cpp
	src/zapit/src/fastscan.cpp
	src/zapit/src/frontend.cpp
	src/zapit/src/getservices.cpp
	src/zapit/src/scan.cpp
	src/zapit/src/scannit.cpp
	src/zapit/src/scanpmt.cpp
	src/zapit/src/transponder.cpp
	src/zapit/src/zapit.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 69c4dbbdba
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-12-25 (Thu, 25 Dec 2014)



------------------
This commit was generated by Migit
This commit is contained in:
Stefan Seyfried
2014-12-25 18:03:08 +01:00
parent d60e14c744 516550e2d8
commit c8e3ec41a9
423 changed files with 23934 additions and 12351 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/system/flashtool.cpp
View File

@@ -71,7 +71,7 @@ void CFlashTool::setMTDDevice( const std::string & mtddevice )
printf("flashtool.cpp: set mtd device to %s\n", mtddevice.c_str());
}
void CFlashTool::setStatusViewer( CProgress_StatusViewer* statusview )
void CFlashTool::setStatusViewer( CProgressWindow* statusview )
{
statusViewer = statusview;
}
@@ -472,25 +472,37 @@ CFlashVersionInfo::CFlashVersionInfo(const std::string & versionString)
version = atoi(&releaseCycle[0]) * 100 + atoi(&releaseCycle[2]);
// recover date
struct tm tt;
memset(&tt, 0, sizeof(tt));
date[0] = versionString[10];
date[1] = versionString[11];
date[2] = '.';
tt.tm_mday = atoi(&date[0]);
date[3] = versionString[8];
date[4] = versionString[9];
date[5] = '.';
tt.tm_mon = atoi(&date[3]) - 1;
date[6] = versionString[4];
date[7] = versionString[5];
date[8] = versionString[6];
date[9] = versionString[7];
date[10] = 0;
tt.tm_year = atoi(&date[6]) - 1900;
// recover time stamp
time[0] = versionString[12];
time[1] = versionString[13];
time[2] = ':';
tt.tm_hour = atoi(&time[0]);
time[3] = versionString[14];
time[4] = versionString[15];
time[5] = 0;
tt.tm_min = atoi(&time[3]);
datetime = mktime(&tt);
}
const char *CFlashVersionInfo::getDate(void) const