mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-30 17:01:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dvbsi++' into next

Browse Source
This commit is contained in:
[CST] Focus
2013-01-29 17:42:19 +04:00
parent d1cbff900f 38461dca6c
commit 5776c67825
7 changed files with 22 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cross-configure.cool
View File

@@ -27,5 +27,5 @@ export FREETYPE_CONFIG=$PREFIX/bin/freetype-config
export CURL_CONFIG=$PREFIX/bin/curl-config export CURL_CONFIG=$PREFIX/bin/curl-config
./autogen.sh ./autogen.sh
./configure --prefix=${PREFIX} --build=i386-pc-linux-gnu --host=$HOST --enable-flac --with-target=cdk --with-targetprefix="" "$*" ./configure --prefix=${PREFIX} --build=i386-pc-linux-gnu --host=$HOST --enable-flac --with-target=cdk --with-targetprefix="" --with-boxmodel=nevis "$*"

2
cross-configure.cool.debug
View File

@@ -27,5 +27,5 @@ export FREETYPE_CONFIG=$PREFIX/bin/freetype-config
export CURL_CONFIG=$PREFIX/bin/curl-config export CURL_CONFIG=$PREFIX/bin/curl-config
./autogen.sh ./autogen.sh
./configure --prefix=${PREFIX} --build=i386-pc-linux-gnu --host=$HOST --enable-flac --with-target=cdk --with-targetprefix="" "$*" ./configure --prefix=${PREFIX} --build=i386-pc-linux-gnu --host=$HOST --enable-flac --with-target=cdk --with-targetprefix="" --with-boxmodel=nevis "$*"

2
src/driver/pictureviewer/crw.cpp
View File

@@ -120,7 +120,7 @@ void fh_crw_find_jpeg_thumbnail(FILE *fh)
fsize = ftell(fh); fsize = ftell(fh);
fseek (fh, 0, SEEK_SET); fseek (fh, 0, SEEK_SET);
order=*((unsigned short*)header); order = header[0] << 8 | header[1];
if (order == 0x4949) if (order == 0x4949)
hlength = header[2] + (header[3] << 8) + (header[4] << 16) + (header[5] << 24); hlength = header[2] + (header[3] << 8) + (header[4] << 16) + (header[5] << 24);

14
src/eitd/SIevents.cpp
View File

@@ -249,8 +249,12 @@ void SIevent::parseShortEventDescriptor(const uint8_t *buf, unsigned maxlen)
int tsidonid = (transport_stream_id << 16) | original_network_id; 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'}; char lang[] = {'\0','\0','\0','\0'};
std::string language(lang); 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); int table = getCountryCodeDefaultMapping(language);
buf+=sizeof(struct descr_short_event_header); 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; 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); std::string language(lang);
int table = getCountryCodeDefaultMapping(language); int table = getCountryCodeDefaultMapping(language);

4
src/gui/update_ext.h
View File

@@ -98,14 +98,14 @@ static unsigned int timer_msec;
#define DBG_TIMER_STOP(label) \ #define DBG_TIMER_STOP(label) \
gettimeofday(&timer_tv2, NULL); \ gettimeofday(&timer_tv2, NULL); \
timer_msec = ((timer_tv2.tv_sec - timer_tv.tv_sec) * 1000) + ((timer_tv2.tv_usec - timer_tv.tv_usec) / 1000); \ 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 #else
#define DBG_TIMER_START() #define DBG_TIMER_START()
#define DBG_TIMER_STOP(label) #define DBG_TIMER_STOP(label)
#endif // UPDATE_DEBUG_TIMER #endif // UPDATE_DEBUG_TIMER
#ifdef UPDATE_DEBUG #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 #else
#define DBG_MSG(fmt, args...) #define DBG_MSG(fmt, args...)
#endif // UPDATE_DEBUG #endif // UPDATE_DEBUG

10
src/neutrino.cpp
View File

@@ -3577,11 +3577,11 @@ void CNeutrinoApp::loadKeys(const char * fname)
g_settings.key_list_start = tconfig.getInt32( "key_list_start", CRCInput::RC_nokey ); 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_list_end = tconfig.getInt32( "key_list_end", CRCInput::RC_nokey );
g_settings.key_timeshift = configfile.getInt32( "key_timeshift", CRCInput::RC_pause ); g_settings.key_timeshift = tconfig.getInt32( "key_timeshift", CRCInput::RC_pause );
g_settings.key_plugin = configfile.getInt32( "key_plugin", CRCInput::RC_nokey ); g_settings.key_plugin = tconfig.getInt32( "key_plugin", CRCInput::RC_nokey );
g_settings.key_unlock = configfile.getInt32( "key_unlock", CRCInput::RC_setup ); g_settings.key_unlock = tconfig.getInt32( "key_unlock", CRCInput::RC_setup );
g_settings.key_screenshot = configfile.getInt32( "key_screenshot", CRCInput::RC_nokey ); g_settings.key_screenshot = tconfig.getInt32( "key_screenshot", CRCInput::RC_nokey );
g_settings.key_current_transponder = configfile.getInt32( "key_current_transponder", CRCInput::RC_games ); 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_up = tconfig.getInt32( "key_quickzap_up", CRCInput::RC_up );
g_settings.key_quickzap_down = tconfig.getInt32( "key_quickzap_down", CRCInput::RC_down ); g_settings.key_quickzap_down = tconfig.getInt32( "key_quickzap_down", CRCInput::RC_down );

1
src/timerd/timermanager.cpp
View File

@@ -1143,6 +1143,7 @@ CTimerEvent_Record::CTimerEvent_Record(CConfigFile *config, int iId):
//------------------------------------------------------------ //------------------------------------------------------------
void CTimerEvent_Record::fireEvent() void CTimerEvent_Record::fireEvent()
{ {
Refresh();
CTimerd::RecordingInfo ri=eventInfo; CTimerd::RecordingInfo ri=eventInfo;
ri.eventID=eventID; ri.eventID=eventID;
strcpy(ri.recordingDir, recordingDir.substr(0,sizeof(ri.recordingDir)-1).c_str()); strcpy(ri.recordingDir, recordingDir.substr(0,sizeof(ri.recordingDir)-1).c_str());