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

Merge branch 'dvbsi++' into next

Browse Source 
Conflicts:
	src/neutrino.cpp
	src/zapit/src/femanager.cpp
	src/zapit/src/getservices.cpp
	src/zapit/src/transponder.cpp
This commit is contained in:
[CST] Focus
2013-02-28 16:39:34 +04:00
parent cddfcf3bf9 e74f1db278
commit 026592e8fe
70 changed files with 544 additions and 417 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/gui/zapit_setup.cpp
View File

@@ -6,6 +6,8 @@
Homepage: http://dbox.cyberphoria.org/
License: GPL
Copyright (C) 2011-2012 Stefan Seyfried
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
@@ -117,7 +119,7 @@ int CSelectChannelWidget::exec(CMenuTarget* parent, const std::string& actionKey
{
unsigned int cnr = 0;
t_channel_id channel_id = 0;
sscanf(&(actionKey[4]),"%u|%llx", &cnr,&channel_id);
sscanf(&(actionKey[4]),"%u|%" SCNx64 "", &cnr, &channel_id);
if (strncmp(actionKey.c_str(), "ZCT:", 4) == 0)//...tv
{
@@ -157,7 +159,7 @@ int CSelectChannelWidget::InitZapitChannelHelper(CZapitClient::channelsMode mode
for(int j = 0; j < (int) channels.size(); j++) {
CZapitChannel * channel = channels[j];
char cChannelId[60] = {0};
snprintf(cChannelId,sizeof(cChannelId),"ZC%c:%d|%llx#",(mode==CZapitClient::MODE_TV)?'T':'R',channel->number,channel->channel_id);
snprintf(cChannelId, sizeof(cChannelId), "ZC%c:%d|%" PRIx64 "#", (mode==CZapitClient::MODE_TV)?'T':'R', channel->number, channel->channel_id);
CMenuForwarderNonLocalized * chan_item = new CMenuForwarderNonLocalized(channel->getName().c_str(), true, NULL, this, (std::string(cChannelId) + channel->getName()).c_str(), CRCInput::RC_nokey, NULL, channel->scrambled ?NEUTRINO_ICON_SCRAMBLED:NULL);
chan_item->setItemButton(NEUTRINO_ICON_BUTTON_OKAY, true);