From f7f5ca3eb690c8fc42d086c944fe2292fe23da0b Mon Sep 17 00:00:00 2001
From: satbaby <satbaby@e54a6e83-5905-42d5-8d5c-058d10e6a962>
Date: Mon, 25 Oct 2010 14:24:49 +0000
Subject: [PATCH] remove 0xd3 from fix_service_type

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@866 e54a6e83-5905-42d5-8d5c-058d10e6a962
---
 src/gui/Makefile.am           | 2 +-
 src/gui/channellist.cpp       | 8 +++++++-
 src/gui/channellist.h         | 1 +
 src/neutrino.cpp              | 8 +++-----
 src/zapit/src/descriptors.cpp | 2 +-
 5 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/src/gui/Makefile.am b/src/gui/Makefile.am
index 52b61386c..99974a70e 100644
--- a/src/gui/Makefile.am
+++ b/src/gui/Makefile.am
@@ -5,7 +5,7 @@ BUILT_SOURCES  = svn_version.h
 
 svn_version.h:
 	@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 \
 		rm svn_version.h; echo '#define BUILT_DATE "'`date`'"' > svn_version.h ; \
 	fi
diff --git a/src/gui/channellist.cpp b/src/gui/channellist.cpp
index fcf4fa6da..d62be1de8 100644
--- a/src/gui/channellist.cpp
+++ b/src/gui/channellist.cpp
@@ -253,6 +253,11 @@ void CChannelList::SortSat(void)
 	sort(chanlist.begin(), chanlist.end(), CmpChannelBySat());
 }
 
+void CChannelList::SortTP(void)
+{
+	sort(chanlist.begin(), chanlist.end(), CmpChannelByFreq());
+}
+
 CZapitChannel* CChannelList::getChannel(int number)
 {
 	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)
 						new_mode = LIST_MODE_PROV;
 					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;
+					}
 					has_channel = TVsatList->adjustToChannelID(channel_id);
 					if(!has_channel && old_mode == LIST_MODE_SAT)
 						new_mode = LIST_MODE_ALL;
diff --git a/src/gui/channellist.h b/src/gui/channellist.h
index 347c6d441..bc50069be 100644
--- a/src/gui/channellist.h
+++ b/src/gui/channellist.h
@@ -135,6 +135,7 @@ class CChannelList
 		int doChannelMenu(void);
 		void SortAlpha(void);
 		void SortSat(void);
+		void SortTP(void);
 		void ClearList(void);
 		bool SameTP(t_channel_id channel_id = 0);
 		//friend class CZapitChannel;
diff --git a/src/neutrino.cpp b/src/neutrino.cpp
index bc17d5558..dc4cdee2e 100644
--- a/src/neutrino.cpp
+++ b/src/neutrino.cpp
@@ -1931,6 +1931,9 @@ printf("CNeutrinoApp::SetChannelMode %d\n", newmode);
 			} else {
 				bouquetList = TVsatList;
 			}
+	for (uint32_t i = 0; i < bouquetList->Bouquets.size(); i++) {
+		bouquetList->Bouquets[i]->channelList->SortTP();
+	}
 			break;
 		case LIST_MODE_ALL:
 			if(mode == mode_radio) {
@@ -2503,11 +2506,6 @@ int CNeutrinoApp::run(int argc, char **argv)
 	g_PluginList = new CPlugins;
 	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();
 	//load Pluginlist before main menu (only show script menu if at least one script is available
diff --git a/src/zapit/src/descriptors.cpp b/src/zapit/src/descriptors.cpp
index ed8c5d3d4..ec6338218 100644
--- a/src/zapit/src/descriptors.cpp
+++ b/src/zapit/src/descriptors.cpp
@@ -386,7 +386,7 @@ uint8_t fix_service_type(uint8_t type)
 	if((type == 0x9A) || (type == 0x86) || (type==0xc3)
 		|| (type==0xc5) || (type==0xc6)  ||
 		(type == 0x11) || (type == 0x19) || (type == 0x82) |
-		(type == 0x87) || (type == 0xd3) || (type == 0xd4) )
+		(type == 0x87) || (type == 0xd3)  )
 			return 1;
 	return type;
 }