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

remove 0xd3 from fix_service_type

Browse Source 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@866 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Branch: ni/coolstream
Commit: f7f5ca3eb6
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2010-10-25 (Mon, 25 Oct 2010)



------------------
This commit was generated by Migit
This commit is contained in:
Jacek Jendrzej
2010-10-25 14:24:49 +00:00
parent 4bac02b3d2
commit 7339986561
5 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui/Makefile.am
View File

@@ -5,7 +5,7 @@ BUILT_SOURCES = svn_version.h
svn_version.h: svn_version.h:
@if test -d .svn ; then \ @if test -d .svn ; then \
rm svn_version.h; echo "#define SVNVERSION \"$$(svnversion -n || echo svn_oops!)\" " > svn_version.h ; \ sleep 180 && rm svn_version.h & echo "#define SVNVERSION \"$$(svnversion -n || echo svn_oops!)\" " > svn_version.h ; \
else \ else \
rm svn_version.h; echo '#define BUILT_DATE "'`date`'"' > svn_version.h ; \ rm svn_version.h; echo '#define BUILT_DATE "'`date`'"' > svn_version.h ; \
fi fi

8
src/gui/channellist.cpp
View File

@@ -253,6 +253,11 @@ void CChannelList::SortSat(void)
sort(chanlist.begin(), chanlist.end(), CmpChannelBySat()); sort(chanlist.begin(), chanlist.end(), CmpChannelBySat());
} }
void CChannelList::SortTP(void)
{
sort(chanlist.begin(), chanlist.end(), CmpChannelByFreq());
}
CZapitChannel* CChannelList::getChannel(int number) CZapitChannel* CChannelList::getChannel(int number)
{ {
for (uint32_t i=0; i< chanlist.size();i++) { for (uint32_t i=0; i< chanlist.size();i++) {
@@ -943,8 +948,9 @@ printf("CChannelList::adjustToChannelID me %x [%s] list size %d channel_id %llx\
if(!has_channel && old_mode == LIST_MODE_FAV) if(!has_channel && old_mode == LIST_MODE_FAV)
new_mode = LIST_MODE_PROV; new_mode = LIST_MODE_PROV;
has_channel = TVbouquetList->adjustToChannelID(channel_id); has_channel = TVbouquetList->adjustToChannelID(channel_id);
if(!has_channel && old_mode == LIST_MODE_PROV) if(!has_channel && old_mode == LIST_MODE_PROV){
new_mode = LIST_MODE_SAT; new_mode = LIST_MODE_SAT;
}
has_channel = TVsatList->adjustToChannelID(channel_id); has_channel = TVsatList->adjustToChannelID(channel_id);
if(!has_channel && old_mode == LIST_MODE_SAT) if(!has_channel && old_mode == LIST_MODE_SAT)
new_mode = LIST_MODE_ALL; new_mode = LIST_MODE_ALL;

1
src/gui/channellist.h
View File

@@ -135,6 +135,7 @@ class CChannelList
int doChannelMenu(void); int doChannelMenu(void);
void SortAlpha(void); void SortAlpha(void);
void SortSat(void); void SortSat(void);
void SortTP(void);
void ClearList(void); void ClearList(void);
bool SameTP(t_channel_id channel_id = 0); bool SameTP(t_channel_id channel_id = 0);
//friend class CZapitChannel; //friend class CZapitChannel;

8
src/neutrino.cpp
View File

@@ -1931,6 +1931,9 @@ printf("CNeutrinoApp::SetChannelMode %d\n", newmode);
} else { } else {
bouquetList = TVsatList; bouquetList = TVsatList;
} }
for (uint32_t i = 0; i < bouquetList->Bouquets.size(); i++) {
bouquetList->Bouquets[i]->channelList->SortTP();
}
break; break;
case LIST_MODE_ALL: case LIST_MODE_ALL:
if(mode == mode_radio) { if(mode == mode_radio) {
@@ -2503,11 +2506,6 @@ int CNeutrinoApp::run(int argc, char **argv)
g_PluginList = new CPlugins; g_PluginList = new CPlugins;
g_PluginList->setPluginDir(PLUGINDIR); g_PluginList->setPluginDir(PLUGINDIR);
// mount shares before scanning for plugins
system("mkdir /media/sda1 2> /dev/null");
system("mount /media/sda1 2> /dev/null");
system("mkdir /media/sdb1 2> /dev/null");
system("mount /media/sdb1 2> /dev/null");
CFSMounter::automount(); CFSMounter::automount();
//load Pluginlist before main menu (only show script menu if at least one script is available //load Pluginlist before main menu (only show script menu if at least one script is available

2
src/zapit/src/descriptors.cpp
View File

@@ -386,7 +386,7 @@ uint8_t fix_service_type(uint8_t type)
if((type == 0x9A) || (type == 0x86) || (type==0xc3) if((type == 0x9A) || (type == 0x86) || (type==0xc3)
|| (type==0xc5) || (type==0xc6) || || (type==0xc5) || (type==0xc6) ||
(type == 0x11) || (type == 0x19) || (type == 0x82) | (type == 0x11) || (type == 0x19) || (type == 0x82) |
(type == 0x87) || (type == 0xd3) || (type == 0xd4) ) (type == 0x87) || (type == 0xd3) )
return 1; return 1;
return type; return type;
} }