From 76a0ef0797da362cd58481d26697bc576f358c6f Mon Sep 17 00:00:00 2001 From: Thilo Graf Date: Sun, 13 Jan 2013 16:28:11 +0100 Subject: [PATCH 1/6] extended update: move ext_update.* to update_ext.* Beware the canonical order of filenames. Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/9939fc9197db4f607783cbea0c5f823e63304e45 Author: Thilo Graf Date: 2013-01-13 (Sun, 13 Jan 2013) ------------------ This commit was generated by Migit --- src/gui/Makefile.am | 2 +- src/gui/update.cpp | 2 +- src/gui/{ext_update.cpp => update_ext.cpp} | 2 +- src/gui/{ext_update.h => update_ext.h} | 0 src/system/helpers.cpp | 2 +- 5 files changed, 4 insertions(+), 4 deletions(-) rename src/gui/{ext_update.cpp => update_ext.cpp} (99%) rename src/gui/{ext_update.h => update_ext.h} (100%) diff --git a/src/gui/Makefile.am b/src/gui/Makefile.am index 39c5967a5..4f084a469 100644 --- a/src/gui/Makefile.am +++ b/src/gui/Makefile.am @@ -57,7 +57,6 @@ libneutrino_gui_a_SOURCES = \ epgplus.cpp \ epgview.cpp \ eventlist.cpp \ - ext_update.cpp \ favorites.cpp \ filebrowser.cpp \ imageinfo.cpp \ @@ -97,6 +96,7 @@ libneutrino_gui_a_SOURCES = \ themes.cpp \ timeosd.cpp \ update.cpp \ + update_ext.cpp \ update_menue.cpp \ update_settings.cpp \ user_menue.cpp \ diff --git a/src/gui/update.cpp b/src/gui/update.cpp index 86a30055f..51ed5e007 100644 --- a/src/gui/update.cpp +++ b/src/gui/update.cpp @@ -35,7 +35,7 @@ #endif #include -#include +#include #include #include diff --git a/src/gui/ext_update.cpp b/src/gui/update_ext.cpp similarity index 99% rename from src/gui/ext_update.cpp rename to src/gui/update_ext.cpp index 4c4ffe169..50619921f 100644 --- a/src/gui/ext_update.cpp +++ b/src/gui/update_ext.cpp @@ -33,7 +33,7 @@ #endif #include -#include +#include #include #include diff --git a/src/gui/ext_update.h b/src/gui/update_ext.h similarity index 100% rename from src/gui/ext_update.h rename to src/gui/update_ext.h diff --git a/src/system/helpers.cpp b/src/system/helpers.cpp index 700f374b8..16ca36bd0 100644 --- a/src/system/helpers.cpp +++ b/src/system/helpers.cpp @@ -37,7 +37,7 @@ #include #include -#include +#include bool file_exists(const char *filename) { From 1214ee0dfc40efaf6311377e9a6d84accd467cfb Mon Sep 17 00:00:00 2001 From: Gaucho316 Date: Mon, 14 Jan 2013 19:45:16 +0100 Subject: [PATCH 2/6] Scan setup: fix memleak Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/ce7869008e969a3db5ed3b82a710158572579bf0 Author: Gaucho316 Date: 2013-01-14 (Mon, 14 Jan 2013) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/gui/scan_setup.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gui/scan_setup.cpp b/src/gui/scan_setup.cpp index eb345732a..274686480 100644 --- a/src/gui/scan_setup.cpp +++ b/src/gui/scan_setup.cpp @@ -633,7 +633,7 @@ int CScanSetup::showUnicableSetup() uni_setup->addIntroItems(); uni_setup->addItem(uniscr); - CMenuForwarder *mf = new CMenuForwarder(LOCALE_UNICABLE_QRG, true, uniqrg->getValue(), uniqrg); + CMenuForwarder *mf = new CMenuDForwarder(LOCALE_UNICABLE_QRG, true, uniqrg->getValue(), uniqrg); uni_setup->addItem(mf); res = uni_setup->exec(NULL, ""); delete uni_setup; From e1509315bd1037225747ee9e1c07fae2334e8bdf Mon Sep 17 00:00:00 2001 From: Jacek Jendrzej Date: Wed, 16 Jan 2013 12:03:40 +0100 Subject: [PATCH 3/6] src/gui/update_ext.h: supplement to 76a0ef0797da362cd58481d26697bc576f358c6f Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/30436f353dacf9caaddb1aec45a3e8159b2aa187 Author: Jacek Jendrzej Date: 2013-01-16 (Wed, 16 Jan 2013) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/gui/update_ext.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/gui/update_ext.h b/src/gui/update_ext.h index 2999c9fa2..d327fab24 100644 --- a/src/gui/update_ext.h +++ b/src/gui/update_ext.h @@ -98,14 +98,14 @@ static unsigned int timer_msec; #define DBG_TIMER_STOP(label) \ gettimeofday(&timer_tv2, NULL); \ timer_msec = ((timer_tv2.tv_sec - timer_tv.tv_sec) * 1000) + ((timer_tv2.tv_usec - timer_tv.tv_usec) / 1000); \ - printf("##### [ext_update.cpp] %s: %u msec\n", label, timer_msec); + printf("##### [%s] %s: %u msec\n", __FILE__, label, timer_msec); #else #define DBG_TIMER_START() #define DBG_TIMER_STOP(label) #endif // UPDATE_DEBUG_TIMER #ifdef UPDATE_DEBUG -#define DBG_MSG(fmt, args...) printf("#### [ext_update.cpp:%s:%d] " fmt "\n", __FUNCTION__, __LINE__ , ## args); +#define DBG_MSG(fmt, args...) printf("#### [%s:%s:%d] " fmt "\n", __FILE__, __FUNCTION__, __LINE__ , ## args); #else #define DBG_MSG(fmt, args...) #endif // UPDATE_DEBUG From a50cd83e13e72ce42dbeeab80a440f040fff035f Mon Sep 17 00:00:00 2001 From: Jacek Jendrzej Date: Tue, 22 Jan 2013 17:27:51 +0100 Subject: [PATCH 4/6] fix compil warnings Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/460e224a2836686be91beedd2939dce6cba077ff Author: Jacek Jendrzej Date: 2013-01-22 (Tue, 22 Jan 2013) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/driver/pictureviewer/crw.cpp | 2 +- src/eitd/SIevents.cpp | 14 +++++++++++--- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/src/driver/pictureviewer/crw.cpp b/src/driver/pictureviewer/crw.cpp index 16bba96fb..83a0c0532 100644 --- a/src/driver/pictureviewer/crw.cpp +++ b/src/driver/pictureviewer/crw.cpp @@ -120,7 +120,7 @@ void fh_crw_find_jpeg_thumbnail(FILE *fh) fsize = ftell(fh); fseek (fh, 0, SEEK_SET); - order=*((unsigned short*)header); + order = header[0] << 8 | header[1]; if (order == 0x4949) hlength = header[2] + (header[3] << 8) + (header[4] << 16) + (header[5] << 24); diff --git a/src/eitd/SIevents.cpp b/src/eitd/SIevents.cpp index 78e60f5b6..f4849c03d 100644 --- a/src/eitd/SIevents.cpp +++ b/src/eitd/SIevents.cpp @@ -249,8 +249,12 @@ void SIevent::parseShortEventDescriptor(const uint8_t *buf, unsigned maxlen) int tsidonid = (transport_stream_id << 16) | original_network_id; - char lang[] = {tolower(evt->language_code_hi), tolower(evt->language_code_mid), tolower(evt->language_code_lo), '\0'}; - std::string language(lang); + char lang[] = {'\0','\0','\0','\0'}; + lang[0] = tolower(evt->language_code_hi); + lang[1] = tolower(evt->language_code_mid); + lang[2] = tolower(evt->language_code_lo); + + std::string language(lang); int table = getCountryCodeDefaultMapping(language); buf+=sizeof(struct descr_short_event_header); @@ -272,7 +276,11 @@ void SIevent::parseExtendedEventDescriptor(const uint8_t *buf, unsigned maxlen) int tsidonid = (transport_stream_id << 16) | original_network_id; - char lang[] = {tolower(evt->iso_639_2_language_code_hi), tolower(evt->iso_639_2_language_code_mid), tolower(evt->iso_639_2_language_code_lo), '\0'}; + char lang[] = {'\0','\0','\0','\0'}; + lang[0] = tolower(evt->iso_639_2_language_code_hi); + lang[1] = tolower(evt->iso_639_2_language_code_mid); + lang[2] = tolower(evt->iso_639_2_language_code_lo); + std::string language(lang); int table = getCountryCodeDefaultMapping(language); From 19ce0c994ebba54d1591e3da98cd55a60ca08bbe Mon Sep 17 00:00:00 2001 From: "J. Krieg" Date: Tue, 22 Jan 2013 18:08:08 +0100 Subject: [PATCH 5/6] Neutrino: 'Port' of Neutrino-SD 'Additionally refresh EPG before recording starts' Patch by Gaucho316: http://www.dbox2-tuning.net/forum/viewtopic.php?f=2&t=50004 Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/05773297402fd0b51caebc400df9ff8e1af98b44 Author: J. Krieg Date: 2013-01-22 (Tue, 22 Jan 2013) ------------------ This commit was generated by Migit --- src/timerd/timermanager.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/timerd/timermanager.cpp b/src/timerd/timermanager.cpp index 9f1386050..917f1e003 100644 --- a/src/timerd/timermanager.cpp +++ b/src/timerd/timermanager.cpp @@ -1143,6 +1143,7 @@ CTimerEvent_Record::CTimerEvent_Record(CConfigFile *config, int iId): //------------------------------------------------------------ void CTimerEvent_Record::fireEvent() { + Refresh(); CTimerd::RecordingInfo ri=eventInfo; ri.eventID=eventID; strcpy(ri.recordingDir, recordingDir.substr(0,sizeof(ri.recordingDir)-1).c_str()); From 785d3f2046b3f256b8f20e8e3ed48dc7e88cf943 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Tue, 29 Jan 2013 13:13:55 +0100 Subject: [PATCH 6/6] neutrino.cpp: fix wrong configfile in loadKeys() Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/13204626266ff0d9bea76c707b4b92bd8f32dc00 Author: vanhofen Date: 2013-01-29 (Tue, 29 Jan 2013) Origin message was: ------------------ - neutrino.cpp: fix wrong configfile in loadKeys() ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/neutrino.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/neutrino.cpp b/src/neutrino.cpp index 5ca12639c..beec61763 100644 --- a/src/neutrino.cpp +++ b/src/neutrino.cpp @@ -3597,11 +3597,11 @@ void CNeutrinoApp::loadKeys(const char * fname) g_settings.key_list_start = tconfig.getInt32( "key_list_start", CRCInput::RC_nokey ); g_settings.key_list_end = tconfig.getInt32( "key_list_end", CRCInput::RC_nokey ); - g_settings.key_timeshift = configfile.getInt32( "key_timeshift", CRCInput::RC_pause ); - g_settings.key_plugin = configfile.getInt32( "key_plugin", CRCInput::RC_nokey ); - g_settings.key_unlock = configfile.getInt32( "key_unlock", CRCInput::RC_setup ); - g_settings.key_screenshot = configfile.getInt32( "key_screenshot", CRCInput::RC_nokey ); - g_settings.key_current_transponder = configfile.getInt32( "key_current_transponder", CRCInput::RC_games ); + g_settings.key_timeshift = tconfig.getInt32( "key_timeshift", CRCInput::RC_pause ); + g_settings.key_plugin = tconfig.getInt32( "key_plugin", CRCInput::RC_nokey ); + g_settings.key_unlock = tconfig.getInt32( "key_unlock", CRCInput::RC_setup ); + g_settings.key_screenshot = tconfig.getInt32( "key_screenshot", CRCInput::RC_nokey ); + g_settings.key_current_transponder = tconfig.getInt32( "key_current_transponder", CRCInput::RC_games ); g_settings.key_quickzap_up = tconfig.getInt32( "key_quickzap_up", CRCInput::RC_up ); g_settings.key_quickzap_down = tconfig.getInt32( "key_quickzap_down", CRCInput::RC_down );