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

some compil warning fixes

Browse Source
This commit is contained in:
Jacek Jendrzej
2016-04-22 16:46:21 +02:00
parent f78fc97fe3
commit 8638cd73b7
6 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/driver/record.cpp
View File

@@ -706,8 +706,6 @@ record_error_msg_t CRecordInstance::MakeFileName(CZapitChannel * channel)
MakeExtFileName(channel, ext_file_name); MakeExtFileName(channel, ext_file_name);
strcpy(&(filename[pos]), UTF8_TO_FILESYSTEM_ENCODING(ext_file_name.c_str())); strcpy(&(filename[pos]), UTF8_TO_FILESYSTEM_ENCODING(ext_file_name.c_str()));
pos = strlen(filename);
if(autoshift) if(autoshift)
strncat(filename, "_temp",FILENAMEBUFFERSIZE - strlen(filename)-1); strncat(filename, "_temp",FILENAMEBUFFERSIZE - strlen(filename)-1);

2
src/gui/audio_select.cpp
View File

@@ -198,7 +198,7 @@ int CAudioSelectMenuHandler::doMenu ()
/* setting volume percent to zapit with channel_id/apid = 0 means current channel and pid */ /* setting volume percent to zapit with channel_id/apid = 0 means current channel and pid */
CVolume::getInstance()->SetCurrentChannel(0); CVolume::getInstance()->SetCurrentChannel(0);
CVolume::getInstance()->SetCurrentPid(0); CVolume::getInstance()->SetCurrentPid(0);
int percent[p_count]; int percent[p_count+1];//+1 avoid zero size
for (uint i=0; i < p_count; i++) { for (uint i=0; i < p_count; i++) {
percent[i] = CZapit::getInstance()->GetPidVolume(0, g_RemoteControl->current_PIDs.APIDs[i].pid, g_RemoteControl->current_PIDs.APIDs[i].is_ac3); percent[i] = CZapit::getInstance()->GetPidVolume(0, g_RemoteControl->current_PIDs.APIDs[i].pid, g_RemoteControl->current_PIDs.APIDs[i].is_ac3);
AudioSelector.addItem(new CMenuOptionNumberChooser(g_RemoteControl->current_PIDs.APIDs[i].desc, AudioSelector.addItem(new CMenuOptionNumberChooser(g_RemoteControl->current_PIDs.APIDs[i].desc,

6
src/gui/bouquetlist.cpp
View File

@@ -717,9 +717,9 @@ void CBouquetList::paint()
int ypos = y+ theight; int ypos = y+ theight;
int sb = fheight* listmaxshow; int sb = fheight* listmaxshow;
frameBuffer->paintBoxRel(x+ width- 15,ypos, 15, sb, COL_MENUCONTENT_PLUS_1); frameBuffer->paintBoxRel(x+ width- 15,ypos, 15, sb, COL_MENUCONTENT_PLUS_1);
int listmaxshow_tmp = listmaxshow ? listmaxshow : 1;//avoid division by zero
int sbc= ((bsize - 1)/ listmaxshow)+ 1; /* bsize is > 0, so sbc is also > 0 */ int sbc= ((bsize - 1)/ listmaxshow_tmp)+ 1; /* bsize is > 0, so sbc is also > 0 */
int sbs= (selected/listmaxshow); int sbs= (selected/listmaxshow_tmp);
frameBuffer->paintBoxRel(x+ width- 13, ypos+ 2+ sbs * (sb-4)/sbc, 11, (sb-4)/sbc, COL_MENUCONTENT_PLUS_3); frameBuffer->paintBoxRel(x+ width- 13, ypos+ 2+ sbs * (sb-4)/sbc, 11, (sb-4)/sbc, COL_MENUCONTENT_PLUS_3);
} }

3
src/gui/lua/luainstance.cpp
View File

@@ -682,9 +682,12 @@ int CLuaInstance::GCWindow(lua_State *L)
else if (videoDecoder->getBlank()) else if (videoDecoder->getBlank())
CLuaInstVideo::getInstance()->channelRezap(L); CLuaInstVideo::getInstance()->channelRezap(L);
if(w){
if(w->fbwin)
delete w->fbwin; delete w->fbwin;
w->rcinput = NULL; w->rcinput = NULL;
delete w; delete w;
}
return 0; return 0;
} }

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

@@ -233,7 +233,7 @@ void CShellWindow::showResult()
show_button = true; show_button = true;
} }
else if (mode & ACKNOWLEDGE_EVENT){ else if (mode & ACKNOWLEDGE_EVENT){
if (*res != 0){ if (res && *res != 0){
OnResultError(res); OnResultError(res);
if (OnResultError.empty()) if (OnResultError.empty())
DisplayErrorMessage("Error while execution of task. Please see window for details!"); DisplayErrorMessage("Error while execution of task. Please see window for details!");

3
src/zapit/src/zapit.cpp
View File

@@ -2638,14 +2638,13 @@ bool CZapitSdtMonitor::Stop()
void CZapitSdtMonitor::run() void CZapitSdtMonitor::run()
{ {
time_t /*tstart,*/ tcur, wtime = 0; time_t /*tstart,*/ tcur = 0, wtime = 0;
t_transport_stream_id transport_stream_id = 0; t_transport_stream_id transport_stream_id = 0;
t_original_network_id original_network_id = 0; t_original_network_id original_network_id = 0;
t_satellite_position satellitePosition = 0; t_satellite_position satellitePosition = 0;
freq_id_t freq = 0; freq_id_t freq = 0;
transponder_id_t tpid = 0; transponder_id_t tpid = 0;
tcur = time(0);
//tstart = time(0); //tstart = time(0);
sdt_tp.clear(); sdt_tp.clear();
printf("[zapit] sdt monitor started\n"); printf("[zapit] sdt monitor started\n");