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

Merge branch 'uncool/dvbsi++' commit '9d968280bac'

Browse Source 
This is the last commit before the "menu hints" started.
Needs buildfixing...

Conflicts:
	configure.ac
	src/daemonc/remotecontrol.cpp
	src/daemonc/remotecontrol.h
	src/driver/audiodec/basedec.cpp
	src/driver/fb_window.cpp
	src/driver/rcinput.cpp
	src/driver/volume.cpp
	src/global.h
	src/gui/channellist.cpp
	src/gui/eventlist.cpp
	src/gui/infoviewer.cpp
	src/gui/keybind_setup.cpp
	src/gui/miscsettings_menu.cpp
	src/gui/movieplayer.cpp
	src/gui/osd_setup.cpp
	src/gui/plugins.cpp
	src/gui/scan.cpp
	src/gui/scan_setup.cpp
	src/gui/streaminfo2.cpp
	src/gui/videosettings.cpp
	src/gui/widget/buttons.cpp
	src/neutrino.cpp
	src/sectionsd/dmx.cpp
	src/sectionsd/dmxapi.cpp
	src/sectionsd/sectionsd.cpp
	src/system/setting_helpers.cpp
	src/zapit/include/zapit/client/zapittypes.h
	src/zapit/include/zapit/frontend_c.h
	src/zapit/include/zapit/satconfig.h
	src/zapit/include/zapit/scan.h
	src/zapit/lib/zapitclient.cpp
	src/zapit/src/Makefile.am
	src/zapit/src/frontend.cpp
	src/zapit/src/getservices.cpp
	src/zapit/src/pmt.cpp
	src/zapit/src/scan.cpp
	src/zapit/src/sdt.cpp
	src/zapit/src/zapit.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: ae1b98aa38
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-07-22 (Sun, 22 Jul 2012)



------------------
This commit was generated by Migit
This commit is contained in:
Stefan Seyfried
2012-07-22 14:09:43 +02:00
parent 2da175a159 9d968280ba
commit 3df9a6f7f5
354 changed files with 17604 additions and 32020 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/gui/bouquetlist.cpp
View File

@@ -72,7 +72,7 @@ CBouquetList::CBouquetList(const char * const Name)
CBouquetList::~CBouquetList()
{
for (std::vector<CBouquet *>::iterator it = Bouquets.begin(); it != Bouquets.end(); it++) {
for (std::vector<CBouquet *>::iterator it = Bouquets.begin(); it != Bouquets.end(); ++it) {
delete (*it);
}
Bouquets.clear();
@@ -81,7 +81,15 @@ CBouquetList::~CBouquetList()
CBouquet* CBouquetList::addBouquet(CZapitBouquet * zapitBouquet)
{
int BouquetKey= Bouquets.size();//FIXME not used ?
CBouquet* tmp = new CBouquet(BouquetKey, zapitBouquet->bFav ? g_Locale->getText(LOCALE_FAVORITES_BOUQUETNAME) : zapitBouquet->Name.c_str(), zapitBouquet->bLocked);
const char * bname;
if (zapitBouquet->bFav)
bname = g_Locale->getText(LOCALE_FAVORITES_BOUQUETNAME);
else if (zapitBouquet->bOther)
bname = g_Locale->getText(LOCALE_BOUQUETNAME_OTHER);
else
bname = zapitBouquet->Name.c_str();
CBouquet* tmp = new CBouquet(BouquetKey, bname, zapitBouquet->bLocked);
tmp->zapitBouquet = zapitBouquet;
Bouquets.push_back(tmp);
return tmp;
@@ -216,7 +224,7 @@ int CBouquetList::doMenu()
CZapitBouquet * tmp, * zapitBouquet;
ZapitChannelList* channels;
if(!Bouquets.size() || g_settings.minimode)
if(Bouquets.empty() || g_settings.minimode)
return 0;
zapitBouquet = Bouquets[selected]->zapitBouquet;
@@ -376,7 +384,7 @@ int CBouquetList::show(bool bShowChannelList)
return -3;
}
}
else if(Bouquets.size() == 0)
else if(Bouquets.empty())
continue; //FIXME msgs not forwarded to neutrino !!
else if ( msg == CRCInput::RC_setup) {
int ret = doMenu();
@@ -588,7 +596,7 @@ void CBouquetList::paint()
{
liststart = (selected/listmaxshow)*listmaxshow;
int lastnum = liststart + listmaxshow;
int bsize = Bouquets.size() > 0 ? Bouquets.size() : 1;
int bsize = Bouquets.empty() ? 1 : Bouquets.size();
if(lastnum<10)
numwidth = g_Font[SNeutrinoSettings::FONT_TYPE_CHANNELLIST_NUMBER]->getRenderWidth("0");
@@ -605,7 +613,7 @@ void CBouquetList::paint()
::paintButtons(x, y + (height - footerHeight), width, sizeof(CBouquetListButtons)/sizeof(CBouquetListButtons[0]), CBouquetListButtons, width, footerHeight);
if(Bouquets.size())
if(!Bouquets.empty())
{
for(unsigned int count=0;count<listmaxshow;count++) {
paintItem(count);