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

CKeyValue:: -fix get current name , fix -Wconversion in timerd

Browse Source
This commit is contained in:
Jacek Jendrzej
2014-01-31 11:16:06 +01:00
parent f2fccc6d85
commit 2441171656
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui/widget/keychooser.cpp
View File

@@ -53,7 +53,7 @@ public:
keyvalue = k; keyvalue = k;
}; };
virtual const char * getString(void) virtual const char * getName(void)
{ {
the_text = g_Locale->getText(LOCALE_KEYCHOOSERMENU_CURRENTKEY); the_text = g_Locale->getText(LOCALE_KEYCHOOSERMENU_CURRENTKEY);
the_text += ": "; the_text += ": ";

4
src/timerd/timermanager.cpp
View File

@@ -1147,13 +1147,13 @@ CTimerEvent_Record::CTimerEvent_Record(CConfigFile *config, int iId):
eventInfo.epgID = config->getInt64("EVENT_INFO_EPG_ID_"+id); eventInfo.epgID = config->getInt64("EVENT_INFO_EPG_ID_"+id);
dprintf("read EVENT_INFO_EPG_ID_%s %ld\n",id.c_str(),(long)eventInfo.epgID); dprintf("read EVENT_INFO_EPG_ID_%s %ld\n",id.c_str(),(long)eventInfo.epgID);
eventInfo.epg_starttime = config->getInt64("EVENT_INFO_EPG_STARTTIME_"+id); eventInfo.epg_starttime = (long int)config->getInt64("EVENT_INFO_EPG_STARTTIME_"+id);
dprintf("read EVENT_INFO_EPG_STARTTIME_%s %ld\n",id.c_str(),(long)eventInfo.epg_starttime); dprintf("read EVENT_INFO_EPG_STARTTIME_%s %ld\n",id.c_str(),(long)eventInfo.epg_starttime);
eventInfo.channel_id = config->getInt64("EVENT_INFO_CHANNEL_ID_"+id); eventInfo.channel_id = config->getInt64("EVENT_INFO_CHANNEL_ID_"+id);
dprintf("read EVENT_INFO_CHANNEL_ID_%s %ld\n",id.c_str(),(long)eventInfo.channel_id); dprintf("read EVENT_INFO_CHANNEL_ID_%s %ld\n",id.c_str(),(long)eventInfo.channel_id);
eventInfo.apids = config->getInt32("EVENT_INFO_APIDS_"+id); eventInfo.apids = (unsigned char)config->getInt32("EVENT_INFO_APIDS_"+id);
dprintf("read EVENT_INFO_APIDS_%s 0x%X (%p)\n",id.c_str(),eventInfo.apids,&eventInfo.apids); dprintf("read EVENT_INFO_APIDS_%s 0x%X (%p)\n",id.c_str(),eventInfo.apids,&eventInfo.apids);
recordingDir = config->getString("REC_DIR_"+id); recordingDir = config->getString("REC_DIR_"+id);